[libvirt] [libvirt PATCH v2 20/44] Deprecate QEMU_CAPS_FSDEV

Ján Tomko jtomko at redhat.com
Mon Apr 9 15:20:13 UTC 2018


Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/qemu/qemu_capabilities.c                       |  1 -
 src/qemu/qemu_capabilities.h                       |  2 +-
 src/qemu/qemu_command.c                            |  6 ------
 tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml    |  1 -
 tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml    |  1 -
 tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml    |  1 -
 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml    |  1 -
 tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml    |  1 -
 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml   |  1 -
 tests/qemuxml2argvtest.c                           | 10 +---------
 tests/qemuxml2xmltest.c                            |  6 ------
 30 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 3adb5c9af5..b98563d441 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3635,7 +3635,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA_NONE);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index b2093e52db..8238b4070d 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -104,7 +104,7 @@ typedef enum {
     X_QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */
 
     /* 40 */
-    QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */
+    X_QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */
     QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */
     QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */
     X_QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index cb3c251d12..2a4c261384 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2461,12 +2461,6 @@ qemuBuildFSDevCommandLine(virCommandPtr cmd,
 {
     size_t i;
 
-    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV) && def->nfss) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("filesystem passthrough not supported by this QEMU"));
-        return -1;
-    }
-
     for (i = 0; i < def->nfss; i++) {
         char *optstr;
         virDomainFSDefPtr fs = def->fss[i];
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 7fe822cbf9..770d0df191 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='spice'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 711ad04f0f..cd093fd75c 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='spice'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 4a6749a373..bfae3e804d 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='spice'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index f7f687c85d..81044e9e7c 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='spice'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 9947b7c961..b44373b5d6 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index afbb3a67bc..89a899e646 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 999c1504b4..4f61db3c11 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 8f8b1aaea0..f5477664ff 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='spice'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 1066450dee..b30009519f 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 538fc26e83..9e3dd8c782 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 05481cea13..90a2786f72 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 279f5252e6..314f125a3d 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='enable-kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 8d33a535ad..fc6072ff54 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='spice'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 1d00597110..1de06103d8 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='spice'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index bd52e6eee3..662113f8d8 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='spice'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 7d8b21cda6..ae3d680d6a 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index cf6994147e..6b3dd1251d 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 0b7d397125..189e987c95 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='spice'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 4a1f633dbc..21399ee9d6 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 14750ee6be..74dd4d4e26 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='spice'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 18a81a2ab1..77dd0c33a9 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 55f6066b24..ac2563200b 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='spice'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index da19644d8d..88e2a8c52d 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 544b4ae56e..ab67ea3163 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='vga-none'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 5bbf174cad..08227444a8 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -7,7 +7,6 @@
   <flag name='no-hpet'/>
   <flag name='no-kvm-pit'/>
   <flag name='pci-configfd'/>
-  <flag name='fsdev'/>
   <flag name='name-process'/>
   <flag name='smbios-type'/>
   <flag name='spice'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 7fce1e9b59..a1da098128 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1523,10 +1523,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
             QEMU_CAPS_OBJECT_USB_AUDIO);
     DO_TEST("fs9p",
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT);
     DO_TEST("fs9p-ccw",
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
 
@@ -2101,7 +2099,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -2125,7 +2122,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -2147,7 +2143,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -2168,7 +2163,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -2189,7 +2183,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -2215,7 +2208,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -2796,7 +2788,7 @@ mymain(void)
     DO_TEST("virtio-options", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_KEYBOARD,
             QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
-            QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT,
+            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_VIRTIO_GPU,
             QEMU_CAPS_VIRTIO_GPU_VIRGL,
             QEMU_CAPS_DEVICE_VIRTIO_RNG,
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 6f6c31faa6..236338b6c8 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -745,7 +745,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -767,7 +766,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -789,7 +787,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -810,7 +807,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -831,7 +827,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -856,7 +851,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV,
             QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-- 
2.16.1




More information about the libvir-list mailing list