[libvirt PATCH v2 32/44] Deprecate QEMU_CAPS_FSDEV_WRITEOUT

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
 src/qemu/qemu_capabilities.c                       |  1 -
 src/qemu/qemu_capabilities.h                       |  2 +-
 src/qemu/qemu_command.c                            | 16 ++++------------
 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, 6 insertions(+), 54 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b3f9a6f4e9..b50652349a 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3630,7 +3630,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index e5c5d197fc..0e86f35420 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -164,7 +164,7 @@ typedef enum {
     X_QEMU_CAPS_VIRTIO_BLK_SG_IO, /* SG_IO commands */
     X_QEMU_CAPS_DRIVE_COPY_ON_READ, /* -drive copy-on-read */
     X_QEMU_CAPS_CPU_HOST, /* support for -cpu host */
-    QEMU_CAPS_FSDEV_WRITEOUT, /* -fsdev writeout supported */
+    X_QEMU_CAPS_FSDEV_WRITEOUT, /* -fsdev writeout supported */
 
     /* 85 */
     QEMU_CAPS_DRIVE_IOTUNE, /* -drive bps= and friends */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 22b25ef46a..ad2fed5b67 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2312,8 +2312,7 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd,
 
 
 static char *
-qemuBuildFSStr(virDomainFSDefPtr fs,
-               virQEMUCapsPtr qemuCaps)
+qemuBuildFSStr(virDomainFSDefPtr fs)
 {
     virBuffer opt = VIR_BUFFER_INITIALIZER;
     const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver);
@@ -2351,15 +2350,8 @@ qemuBuildFSStr(virDomainFSDefPtr fs,
         }
     }
 
-    if (fs->wrpolicy) {
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT)) {
-            virBufferAsprintf(&opt, ",writeout=%s", wrpolicy);
-        } else {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("filesystem writeout not supported"));
-            goto error;
-        }
-    }
+    if (fs->wrpolicy)
+        virBufferAsprintf(&opt, ",writeout=%s", wrpolicy);
 
     virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias);
     virBufferAsprintf(&opt, ",path=%s", fs->src->path);
@@ -2430,7 +2422,7 @@ qemuBuildFSDevCommandLine(virCommandPtr cmd,
         virDomainFSDefPtr fs = def->fss[i];
 
         virCommandAddArg(cmd, "-fsdev");
-        if (!(optstr = qemuBuildFSStr(fs, qemuCaps)))
+        if (!(optstr = qemuBuildFSStr(fs)))
             return -1;
         virCommandAddArg(cmd, optstr);
         VIR_FREE(optstr);
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 9ffe77a890..8a5e3f87ee 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -29,7 +29,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 81fa3e5988..8306c9a6eb 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -29,7 +29,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 7f06a83296..a9ae8d1766 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -29,7 +29,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index aa09231fa0..f26fbf863f 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -29,7 +29,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index db0a79fc76..50645fdf4e 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -20,7 +20,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 794a256264..8b4bee1025 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -19,7 +19,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 6354749dc2..35cc26b3c8 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -10,7 +10,6 @@
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index cc001cbbfe..b86f207e4b 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -29,7 +29,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index a1d2c419cd..a812fe010e 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -10,7 +10,6 @@
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 585b25d401..aaa292e9df 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -20,7 +20,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index a3900e79fb..66156aff45 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -19,7 +19,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 3d1c86bd11..c9fcde82d9 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -10,7 +10,6 @@
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 588a77a75c..c51b589726 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -27,7 +27,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 3db0b3476a..9a46343d0a 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -29,7 +29,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index f73c13b36d..dbb2f38825 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -29,7 +29,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 07d3b3a192..946fef766c 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -22,7 +22,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index bf2064d857..c0511233a4 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -19,7 +19,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index f8a7940cc0..4b8f08c45b 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -29,7 +29,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 766ba36a9b..e0026e0b64 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -10,7 +10,6 @@
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index a2cbf61ba2..b89bc46db6 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -29,7 +29,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 93031654da..d6f200a672 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -10,7 +10,6 @@
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 93a0522a9e..ea4891978c 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -29,7 +29,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 8ea49029e1..5d4ce975b9 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -19,7 +19,6 @@
   <flag name='usb-hub'/>
   <flag name='ich9-ahci'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 5de3336806..dd25fbca41 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -10,7 +10,6 @@
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index bc9480c2ce..10f1111272 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -29,7 +29,6 @@
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='virtio-blk-pci.scsi'/>
-  <flag name='fsdev-writeout'/>
   <flag name='drive-iotune'/>
   <flag name='system_wakeup'/>
   <flag name='scsi-disk.channel'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index ae183a380f..4e5d180c62 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1506,9 +1506,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
             QEMU_CAPS_OBJECT_USB_AUDIO);
     DO_TEST("fs9p",
-            QEMU_CAPS_FSDEV_WRITEOUT);
+            NONE);
     DO_TEST("fs9p-ccw",
-            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
 
     DO_TEST("hostdev-usb-address", NONE);
@@ -2082,7 +2081,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
@@ -2105,7 +2103,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
@@ -2126,7 +2123,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
@@ -2146,7 +2142,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
@@ -2166,7 +2161,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
@@ -2191,7 +2185,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
@@ -2770,7 +2763,6 @@ 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_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 3fe8b3b667..32309a0e90 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_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
@@ -766,7 +765,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
@@ -787,7 +785,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
@@ -807,7 +804,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
@@ -827,7 +823,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
@@ -851,7 +846,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_TABLET,
             QEMU_CAPS_VIRTIO_INPUT_HOST,
             QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_FSDEV_WRITEOUT,
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420,
-- 
2.16.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux