qemu: deprecate QEMU_CAPS_DRIVE_CACHE_UNSAFE

Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index bbe03e5b699b34f37ff15928afd9fbd368b8f8f9..cb716ff849d0ecf67c7d373ee31a19697af75049 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3626,7 +3626,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_READONLY);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT);

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 288e92a1f8af9c1fb4fd36744a55209f99ff945d..a95993196b3168572a8ef708f4ba2f3a5e32b8a7 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -153,7 +153,7 @@ typedef enum {
     X_QEMU_CAPS_NO_SHUTDOWN, /* usable -no-shutdown */
 
     /* 75 */
-    QEMU_CAPS_DRIVE_CACHE_UNSAFE, /* Is cache=unsafe supported? */
+    X_QEMU_CAPS_DRIVE_CACHE_UNSAFE, /* Is cache=unsafe supported? */
     X_QEMU_CAPS_PCI_ROMBAR, /* -device rombar=0|1 */
     QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */
     QEMU_CAPS_NO_ACPI, /* -no-acpi */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 69cb76ff4f2d4e349375bba1529ffc6e315dd15f..527a35779decbb8de51e6b5227c94510c974befb 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1348,13 +1348,6 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk,
             return -1;
         }
 
-        if (disk->cachemode == VIR_DOMAIN_DISK_CACHE_UNSAFE &&
-            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("disk cache mode 'unsafe' is not supported by this QEMU"));
-            return -1;
-        }
-
         if (disk->copy_on_read &&
             !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index fedb71b094e5b9ec76ca0546a3aec747a1ffde4d..58208d3f3b025112955f878fdb9cd66fd3c713f3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -26,7 +26,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 85834e71368052155184c40cc791922afc483a0e..d6183e40096b5c1d75eac298dab8cbfbc2a969e6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -26,7 +26,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index fe17eef72dae13482892ee7c32ba435b6e1e6e03..4af8078a56aab51ee6e405bcfa5c5219b60638a8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -26,7 +26,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 3a4c5e5b2f1928e2b06420586622ac38c106bd3c..6bd1dcfb99bbd2572ef929f6a15a6183533b2b92 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -26,7 +26,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 66bfb686bfdc7291636145870c58e2aac5dd65ba..ab1d635e64c864533c366e2cdbc25a63427e362e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -17,7 +17,6 @@
   <flag name='vt82c686b-usb-uhci'/>
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index b4f701985b5579e039049b7c4727f09d3a1cce4b..d26d716452833a8c5d78f3922cf0cf04e2eb30ea 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -17,7 +17,6 @@
   <flag name='vt82c686b-usb-uhci'/>
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index bfbb413dc5cc16dffd37652e42881f4351c25cc5..cfee4d138927c6ce959d76c93ce8b8b0fc6fff0c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -9,7 +9,6 @@
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
-  <flag name='cache-unsafe'/>
   <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index bbaa580d915f8676a7fa67b5c1994bb6b50c48c5..bfd3b3c6370a5a1574d6ccd7b7b472630a8fb580 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -26,7 +26,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 51bf5af1b0cfb35639eac662a4b9e970f11edf2c..398a5a84cb11fcf320519111e5ee3e376a6296f6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -9,7 +9,6 @@
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
-  <flag name='cache-unsafe'/>
   <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index ab607f50d9f78db7afdd00261f876e7da5bb2152..c769b4b369b00ed4d44569cea16cc0af94007544 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -17,7 +17,6 @@
   <flag name='vt82c686b-usb-uhci'/>
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index b1592d82c63c458d358e41ea34bda3c3f0cd7948..0bdaef177ce78d2e1490f3163e17a76e2810b883 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -17,7 +17,6 @@
   <flag name='vt82c686b-usb-uhci'/>
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 1358ed24efd9517bb3da7b49983a3ee6b7a710de..2fe64a7bfd3d74c369527089f638450f17f69b67 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -9,7 +9,6 @@
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
-  <flag name='cache-unsafe'/>
   <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 2bce81d27a260a3b985d80d73d4e55814e356e6c..f71b37cee26d0ef6dd38b6962a4c5aeeee90eb56 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -24,7 +24,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index d61ca6687c7b1f843d2e53464d0f067c6d70b75a..8e7c2a5daff37de3b3955a5ebfa443490830e78d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -26,7 +26,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 4c8a97d19c9fde670df6a83484975a803e4f8dc2..223d0a7a3c0d28f13f6ac5a5758b6c0329954a99 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -26,7 +26,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 8a6cbb75b174e15252a2e9c7d42f4c48677d8f73..46c006b80598f67c2cbb9a65475af7a056bef7e1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -19,7 +19,6 @@
   <flag name='vt82c686b-usb-uhci'/>
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index c20d5cfe559bc5926803101136e6369466c632d1..6c7799924db4f542570dfb174319ce038179316b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -17,7 +17,6 @@
   <flag name='vt82c686b-usb-uhci'/>
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 49f90ff1d131e6fbf95de6553d1ba988a03d26de..720e84b47efc742102c889530c396b26b5d241ee 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -26,7 +26,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index c3c10799e6823e402b01ccc6dd468d8d30cce267..8e2e796b280c48aa306016d8869821142ba56097 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -9,7 +9,6 @@
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
-  <flag name='cache-unsafe'/>
   <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index ce10968e4064bc13dc4a506bb4403d1502987d3e..c900360c071d0720cbd352fda61ee9f10f0e634b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -26,7 +26,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index ec497f50e11b1263b12e5c080359f88a19740bdc..44957621b5fcdb7c394671f34c1e6d82e1d3d60d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -9,7 +9,6 @@
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
-  <flag name='cache-unsafe'/>
   <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index aaafb63506be7ea2bf5e7fec039c58df6a00ccc0..a32a10cfb24d15dc0399b73f9c4dfd6aa68f4cd1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -26,7 +26,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 957e34178f45404b52fb1f24a87eee84e0d44847..db61974e6b630987b31952b0ca7da43139d8effc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -17,7 +17,6 @@
   <flag name='vt82c686b-usb-uhci'/>
   <flag name='pci-ohci'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index a40122a50f9ccda8f19079f5c617facebdce1a16..da8b39dc206adf659413ab4dc7c2d036a17d6145 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -9,7 +9,6 @@
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>
   <flag name='virtio-net-pci.event_idx'/>
-  <flag name='cache-unsafe'/>
   <flag name='fsdev-readonly'/>
   <flag name='virtio-blk-pci.scsi'/>
   <flag name='drive-copy-on-read'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 66d5a2584833a6d44d8b220238352efb40d1f47c..5697923c3edf398c068a6fe0cb8c0e9e025a3969 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -26,7 +26,6 @@
   <flag name='pci-ohci'/>
   <flag name='usb-redir'/>
   <flag name='usb-hub'/>
-  <flag name='cache-unsafe'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 108fb96923e80746fd19a4f1f59cda722b02310b..7f1855782442ab2f37d016a7e55b996224b5ecdf 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -949,8 +949,7 @@ mymain(void)
     DO_TEST("disk-drive-cache-v2-wb", NONE);
     DO_TEST("disk-drive-cache-v2-none", NONE);
     DO_TEST("disk-drive-cache-directsync", NONE);
-    DO_TEST("disk-drive-cache-unsafe",
-            QEMU_CAPS_DRIVE_CACHE_UNSAFE);
+    DO_TEST("disk-drive-cache-unsafe", NONE);
     DO_TEST("disk-drive-copy-on-read",
             QEMU_CAPS_DRIVE_COPY_ON_READ);
     DO_TEST("disk-drive-network-nbd", NONE);