qemu: capabilities: add QEMU_CAPS_FSDEV_MULTIDEVS

The QEMU 9pfs 'multidevs' option exists since QEMU 4.2. Probe QEMU's
command line set though to check whether this option is really
available, and if yes enable this new QEMU_CAPS_FSDEV_MULTIDEVS
capability on libvirt side.
Signed-off-by: NChristian Schoenebeck <qemu_oss@crudebyte.com>
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>

src/qemu/qemu_capabilities.c

@@ -568,6 +568,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "blockdev-snapshot.allow-write-only-overlay",
               "blockdev-reopen",
               "storage.werror",
+
+              /* 360 */
+              "fsdev.multidevs",
     );
 
 
@@ -3160,6 +3163,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
     { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS },
     { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
     { "smp-opts", "dies", QEMU_CAPS_SMP_DIES },
+    { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
 };
 
 static int

src/qemu/qemu_capabilities.h

@@ -550,6 +550,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */
     QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
 
+    /* 360 */
+    QEMU_CAPS_FSDEV_MULTIDEVS, /* fsdev.multidevs */
+
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
 

tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml

@@ -180,6 +180,7 @@
   <flag name='virtio-net.failover'/>
   <flag name='vhost-user-fs'/>
   <flag name='storage.werror'/>
+  <flag name='fsdev.multidevs'/>
   <version>4001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700242</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml

@@ -139,6 +139,7 @@
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='storage.werror'/>
+  <flag name='fsdev.multidevs'/>
   <version>4001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100242</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml

@@ -224,6 +224,7 @@
   <flag name='virtio-net.failover'/>
   <flag name='vhost-user-fs'/>
   <flag name='storage.werror'/>
+  <flag name='fsdev.multidevs'/>
   <version>4002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml

@@ -182,6 +182,7 @@
   <flag name='cpu.kvm-no-adjvtime'/>
   <flag name='vhost-user-fs'/>
   <flag name='storage.werror'/>
+  <flag name='fsdev.multidevs'/>
   <version>4002050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700241</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml

@@ -190,6 +190,7 @@
   <flag name='query-named-block-nodes.flat'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
   <flag name='storage.werror'/>
+  <flag name='fsdev.multidevs'/>
   <version>4002050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900241</microcodeVersion>

tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml

@@ -227,6 +227,7 @@
   <flag name='query-named-block-nodes.flat'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
   <flag name='storage.werror'/>
+  <flag name='fsdev.multidevs'/>
   <version>4002091</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100241</microcodeVersion>