qemu_capabilities: introduce vhost-user-blk capability

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2024-12-22 17:34:18 +03:00 · 2021-02-02 13:37:02 +01:00 · 2021-02-02 13:37:02 +01:00 · c8b0d5b0ad
commit c8b0d5b0ad
parent f00fe96eb0
35 changed files with 40 additions and 0 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -611,6 +611,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "am53c974",
              "virtio-pmem-pci",
              "vhost-user-fs.bootindex",
+
+              /* 390 */
+              "vhost-user-blk",
    );


@ -1331,6 +1334,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
    { "dc390", QEMU_CAPS_SCSI_DC390 },
    { "am53c974", QEMU_CAPS_SCSI_AM53C974 },
    { "virtio-pmem-pci", QEMU_CAPS_DEVICE_VIRTIO_PMEM_PCI },
+    { "vhost-user-blk", QEMU_CAPS_DEVICE_VHOST_USER_BLK },
 };


--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -592,6 +592,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_DEVICE_VIRTIO_PMEM_PCI, /* -device virtio-pmem-pci */
    QEMU_CAPS_VHOST_USER_FS_BOOTINDEX, /* vhost-user-fs.bootindex */

+    /* 390 */
+    QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */
+
    QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -166,6 +166,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>2012000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -167,6 +167,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>2011090</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -133,6 +133,7 @@
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='fsdev.createmode'/>
+  <flag name='vhost-user-blk'/>
  <version>2012000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -210,6 +210,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>2011090</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100289</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -169,6 +169,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>2012050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -103,6 +103,7 @@
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='fsdev.createmode'/>
+  <flag name='vhost-user-blk'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -103,6 +103,7 @@
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='fsdev.createmode'/>
+  <flag name='vhost-user-blk'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -136,6 +136,7 @@
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='fsdev.createmode'/>
+  <flag name='vhost-user-blk'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -216,6 +216,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>3000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100239</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -174,6 +174,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>3000091</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -219,6 +219,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>3000092</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -180,6 +180,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -188,6 +188,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -181,6 +181,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -181,6 +181,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -144,6 +144,7 @@
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='fsdev.createmode'/>
+  <flag name='vhost-user-blk'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -225,6 +225,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -232,6 +232,7 @@
  <flag name='dc390'/>
  <flag name='am53c974'/>
  <flag name='virtio-pmem-pci'/>
+  <flag name='vhost-user-blk'/>
  <version>4001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -193,6 +193,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>4001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -194,6 +194,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>4001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -155,6 +155,7 @@
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='blockdev-hostdev-scsi'/>
  <flag name='fsdev.createmode'/>
+  <flag name='vhost-user-blk'/>
  <version>4002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -241,6 +241,7 @@
  <flag name='dc390'/>
  <flag name='am53c974'/>
  <flag name='virtio-pmem-pci'/>
+  <flag name='vhost-user-blk'/>
  <version>4002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -203,6 +203,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -212,6 +212,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -199,6 +199,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -248,6 +248,7 @@
  <flag name='dc390'/>
  <flag name='am53c974'/>
  <flag name='virtio-pmem-pci'/>
+  <flag name='vhost-user-blk'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -250,6 +250,7 @@
  <flag name='dc390'/>
  <flag name='am53c974'/>
  <flag name='virtio-pmem-pci'/>
+  <flag name='vhost-user-blk'/>
  <version>5001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -207,6 +207,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -214,6 +214,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -201,6 +201,7 @@
  <flag name='fsdev.createmode'/>
  <flag name='dc390'/>
  <flag name='am53c974'/>
+  <flag name='vhost-user-blk'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -162,6 +162,7 @@
  <flag name='block-export-add'/>
  <flag name='netdev.vhost-vdpa'/>
  <flag name='fsdev.createmode'/>
+  <flag name='vhost-user-blk'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -251,6 +251,7 @@
  <flag name='dc390'/>
  <flag name='am53c974'/>
  <flag name='virtio-pmem-pci'/>
+  <flag name='vhost-user-blk'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -252,6 +252,7 @@
  <flag name='am53c974'/>
  <flag name='virtio-pmem-pci'/>
  <flag name='vhost-user-fs.bootindex'/>
+  <flag name='vhost-user-blk'/>
  <version>5002050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>