Re: [libvirt PATCH v2 2/3] qemu: add vhost-vdpa capability

Laine Stump <laine@xxxxxxxxx> · Thu, 3 Sep 2020 00:29:33 -0400

On 9/2/20 3:25 PM, Jonathon Jongsma wrote:
Recent versions of qemu added the -netdev vhost-vdpa device. This
capability allows libvirt to know whether this is supported.


Looks like you haven't rebased since the capabilities file was added for 
qemu 5.2.0, as the capabilitiestest fails.


With that fixed,


Reviewed-by: Laine Stump <laine@xxxxxxxxxx>



Signed-off-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
---
  src/qemu/qemu_capabilities.c                     | 4 ++++
  src/qemu/qemu_capabilities.h                     | 3 +++
  tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 +
  3 files changed, 8 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2cc0c61588..b19928f68d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -597,6 +597,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
                "spapr-tpm-proxy",
                "numa.hmat",
                "blockdev-hostdev-scsi",
+
+              /* 380 */
+              "netdev.vhost-vdpa",
      );
  
  
@@ -1526,6 +1529,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
      { "migrate-set-parameters/arg-type/downtime-limit", QEMU_CAPS_MIGRATION_PARAM_DOWNTIME },
      { "migrate-set-parameters/arg-type/xbzrle-cache-size", QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE },
      { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT },
+    { "netdev_add/arg-type/+vhost-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA },
  };
  
  typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5d08941538..b6110f1c34 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -578,6 +578,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
      QEMU_CAPS_NUMA_HMAT, /* -numa hmat */
      QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI, /* -blockdev used for (i)SCSI hostdevs */
  
+    /* 380 */
+    QEMU_CAPS_NETDEV_VHOST_VDPA, /* -netdev vhost-vdpa*/
+
      QEMU_CAPS_LAST /* this must always be the last item */
  } virQEMUCapsFlags;
  
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 7496ff1379..0fd2f3b816 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -242,6 +242,7 @@
    <flag name='intel-iommu.aw-bits'/>
    <flag name='numa.hmat'/>
    <flag name='blockdev-hostdev-scsi'/>
+  <flag name='netdev.vhost-vdpa'/>
    <version>5001000</version>
    <kvmVersion>0</kvmVersion>
    <microcodeVersion>43100242</microcodeVersion>








