qemu: capabilities: add QEMU_CAPS_FSDEV_CREATEMODE

The QEMU 9pfs 'fmode' and 'dmode' options have existed since QEMU 2.10. Probe QEMU's command line set to check whether these options are available, and if yes, enable this new QEMU_CAPS_FSDEV_CREATEMODE capability on libvirt side. Signed-off-by: Brian Turek <brian.turek@gmail.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Ján Tomko <jtomko@redhat.com>
2025-02-22 19:32:19 +00:00 · 2020-10-08 15:32:23 +01:00 · 2020-10-08 15:32:23 +01:00 · b0f0e96cdd
commit b0f0e96cdd
parent d467144cf2
36 changed files with 37 additions and 0 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -603,6 +603,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "virtio-balloon.free-page-reporting",
              "block-export-add",
              "netdev.vhost-vdpa",
+              "fsdev.createmode",
    );


@ -3328,6 +3329,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
    { "smp-opts", "dies", QEMU_CAPS_SMP_DIES },
    { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
    { "fw_cfg", "file", QEMU_CAPS_FW_CFG },
+    { "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also checked fsdev->dmode */
 };

 static int
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -583,6 +583,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_VIRTIO_BALLOON_FREE_PAGE_REPORTING, /*virtio balloon free-page-reporting */
    QEMU_CAPS_BLOCK_EXPORT_ADD, /* 'block-export-add' command is supported */
    QEMU_CAPS_NETDEV_VHOST_VDPA, /* -netdev vhost-vdpa*/
+    QEMU_CAPS_FSDEV_CREATEMODE, /* fsdev.createmode */

    QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@ -146,6 +146,7 @@
  <flag name='fw_cfg'/>
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
+  <flag name='fsdev.createmode'/>
  <version>2010000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700287</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@ -146,6 +146,7 @@
  <flag name='fw_cfg'/>
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
+  <flag name='fsdev.createmode'/>
  <version>2010000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900287</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@ -112,6 +112,7 @@
  <flag name='fw_cfg'/>
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
+  <flag name='fsdev.createmode'/>
  <version>2010000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100287</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@ -190,6 +190,7 @@
  <flag name='fw_cfg'/>
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
+  <flag name='fsdev.createmode'/>
  <version>2010000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100287</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -120,6 +120,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <version>2011000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100288</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -197,6 +197,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <version>2011000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100288</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -163,6 +163,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -164,6 +164,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -132,6 +132,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -207,6 +207,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -166,6 +166,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -102,6 +102,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -102,6 +102,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -135,6 +135,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -213,6 +213,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -171,6 +171,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -216,6 +216,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -177,6 +177,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -185,6 +185,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -178,6 +178,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -178,6 +178,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -143,6 +143,7 @@
  <flag name='migration-param.bandwidth'/>
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -222,6 +222,7 @@
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='intel-iommu.aw-bits'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -228,6 +228,7 @@
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='intel-iommu.aw-bits'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -190,6 +190,7 @@
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='blockdev-hostdev-scsi'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -191,6 +191,7 @@
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='spapr-tpm-proxy'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -154,6 +154,7 @@
  <flag name='migration-param.downtime'/>
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='blockdev-hostdev-scsi'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -237,6 +237,7 @@
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='intel-iommu.aw-bits'/>
  <flag name='blockdev-hostdev-scsi'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -200,6 +200,7 @@
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='numa.hmat'/>
  <flag name='blockdev-hostdev-scsi'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -209,6 +209,7 @@
  <flag name='spapr-tpm-proxy'/>
  <flag name='numa.hmat'/>
  <flag name='blockdev-hostdev-scsi'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -196,6 +196,7 @@
  <flag name='migration-param.xbzrle-cache-size'/>
  <flag name='numa.hmat'/>
  <flag name='blockdev-hostdev-scsi'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -244,6 +244,7 @@
  <flag name='intel-iommu.aw-bits'/>
  <flag name='numa.hmat'/>
  <flag name='blockdev-hostdev-scsi'/>
+  <flag name='fsdev.createmode'/>
  <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
@ -246,6 +246,7 @@
  <flag name='usb-host.hostdevice'/>
  <flag name='virtio-balloon.free-page-reporting'/>
  <flag name='netdev.vhost-vdpa'/>
+  <flag name='fsdev.createmode'/>
  <version>5001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -248,6 +248,7 @@
  <flag name='virtio-balloon.free-page-reporting'/>
  <flag name='block-export-add'/>
  <flag name='netdev.vhost-vdpa'/>
+  <flag name='fsdev.createmode'/>
  <version>5001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>