qemu: deprecate QEMU_CAPS_DRIVE_AIO

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 01329257cd661b5029d6441755eb48cf2d0c1586..17f21a0dce24e35de08f201d496eb749eb18a226 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3631,7 +3631,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN);

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index c62f6d29916bf4ed0078cd5fdeca1edc856e1d7e..7febeb7ffc98e0809f4fd5ce7396ba427abbc10d 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -119,7 +119,7 @@ typedef enum {
 
     /* 50 */
     QEMU_CAPS_HDA_DUPLEX, /* -device hda-duplex */
-    QEMU_CAPS_DRIVE_AIO, /* -drive aio= supported */
+    X_QEMU_CAPS_DRIVE_AIO, /* -drive aio= supported */
     X_QEMU_CAPS_PCI_MULTIBUS, /* bus=pci.0 vs bus=pci */
     QEMU_CAPS_PCI_BOOTINDEX, /* pci-assign.bootindex */
     QEMU_CAPS_CCID_EMULATED, /* -device ccid-card-emulated */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index c3dd06e2990e00dd70510bfb7cb5f80db6044d62..57eb7b9790355323c637ea4185ab1165d16d85da 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1382,13 +1382,6 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk,
                            _("detect_zeroes is not supported by this QEMU binary"));
             return -1;
         }
-
-        if (disk->iomode &&
-            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_AIO)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("disk aio mode not supported with this QEMU binary"));
-            return -1;
-        }
     }
 
     if (disk->serial &&

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index c32bc60a457057f6809a511e761110425dd3de05..e62d01b5936398f916aa5ae8e4d9f0b7b62e7b28 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='pci-bootindex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index aa4fab4cb51b0ee20b2997c82188bbf371defd5b..1b5342087a675812c7520687f812ce926d6f584c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='pci-bootindex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index a5dcc49a76420479a68c9f8b0e5bb309312ad038..58ba9f7ffeef8cbd2de0ec241dee95cfbffed082 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='pci-bootindex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 19bc333a4c232c12460cfac2c0a2eae8af414fbd..407a28da82eb563e9862e7d6ad2c20f7ed8113cc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='pci-bootindex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index bd21afd6957ff1268e7e280574d125b1d1aed733..d237323da09dd3be22c6c723e7ceaf93a1f97ce4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 9ef5f84fb82d1e848b69aa5ec1bf52e3b175332c..3515fbe6cf1f8c8e810d8c6a2c44c79d9f3c6bbb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 2ec88ddae5d71612fa73d6ce4d83ad298607ddc9..7f807638a2661ef8d99251cd12a66fdf476a8c7b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -5,7 +5,6 @@
   <usedQMP/>
   <flag name='kvm'/>
   <flag name='boot-index'/>
-  <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index fc2d4c7a4adc54f371cf29c878d93babd52e7a0a..9ceb89d49139ca36e2a4db92a3804bfcdc2ae940 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='pci-bootindex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index f87d5b924483b48c696e2c2ad42717ea8845a1d4..5e38c3dbf2aa5b17da2dbe7a95ec186f13e754a4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -5,7 +5,6 @@
   <usedQMP/>
   <flag name='kvm'/>
   <flag name='boot-index'/>
-  <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 64c675895bbd090f3ab40d140341a9465a607996..28b46019344bdb45957b36c5e6010d352473afc3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 10e1b2dde6349467e2d73ef9a8fcab1cb12d7373..d490ce542fee86715783cfa2d1551b0772a369e9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 29090b88ac2e11e959d00fb26fc56657ad8b40d5..654f9c1b2d416d766f5645f1d83c61d43a57b30f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -5,7 +5,6 @@
   <usedQMP/>
   <flag name='enable-kvm'/>
   <flag name='boot-index'/>
-  <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index d806c215ec4c08c8a97bbc45204732effb8ea0a1..63da56e463f8d478ea96b1f9f1f358ce8d3fea33 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -9,7 +9,6 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index a352805ec26f5865ca454268f0cd998057904546..a7b1bb59e6a0a3fac92e2e88a22b311cc92bd739 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='pci-bootindex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 0027ecebfca5a63f451f8dce15da53aa46183dc6..f009164325a4d52245923526a2779f45fa0f5229 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='pci-bootindex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 570fe917838021b72141b2716ec935fc0dd01992..154e723c07fcaf237446cc1399554d4efd1c2227 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index ce35dacd255b29469d74a98f0272967f7969d4b7..5b15b5a1a6cf24b858f133af47dff2376895a3a2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 415275cebfb83eed37483104e561f53918e3d2e9..72b74c66e4d3168960d9f7b27ce2636dc5a06bc4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='pci-bootindex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index c51f30d2a20953f006d684ea076c6bf62b0c3e2a..c644b539f519f107cd5f84b62b5d32f8131460f0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -5,7 +5,6 @@
   <usedQMP/>
   <flag name='kvm'/>
   <flag name='boot-index'/>
-  <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index a0db647f60e0af908b2d1b7aa6ae2a526f185a27..9d3b8e10c5ed863d2b80d9e6b4f3f44c2f2d274b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='pci-bootindex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index e3d8ff673840f072f0629a6573c8460114154f7b..6896469a44649c204e4659bda032cd7c00e0ef8b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -5,7 +5,6 @@
   <usedQMP/>
   <flag name='kvm'/>
   <flag name='boot-index'/>
-  <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index c18d19e4ca91a852fc3160a37e810773d0683d2c..3243828510b989e9333a27c096900086a992dbe9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='pci-bootindex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index beda90f0e00c1ae69d91dc1f037a73a08abd59e2..07adc73fb40d009537d2a6068774a1dd4f7953b3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -6,7 +6,6 @@
   <flag name='kvm'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 7e3a3fe3c8454793b554ffd762f66b8bdc9d834c..0c585d9983df04ea1ad550099ec08326d5ee5e69 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -5,7 +5,6 @@
   <usedQMP/>
   <flag name='kvm'/>
   <flag name='boot-index'/>
-  <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
   <flag name='virtio-blk-pci.ioeventfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 82679b611f9753d1ef4fb08b354f07946dd1e367..d827a79635e8c272990a01e029d43f835d10f4c5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -10,7 +10,6 @@
   <flag name='spice'/>
   <flag name='boot-index'/>
   <flag name='hda-duplex'/>
-  <flag name='drive-aio'/>
   <flag name='pci-bootindex'/>
   <flag name='ccid-emulated'/>
   <flag name='ccid-passthru'/>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 95a256cd2d8b61dfdfcd0ff077417b5c831b344c..f84686295225356fbb0e4df4e058772d61f91243 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -836,7 +836,6 @@ mymain(void)
             QEMU_CAPS_KVM,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_PIIX3_USB_UHCI,
-            QEMU_CAPS_DRIVE_AIO,
             QEMU_CAPS_CCID_PASSTHRU,
             QEMU_CAPS_CHARDEV_SPICEVMC,
             QEMU_CAPS_SPICE,
@@ -1032,8 +1031,7 @@ mymain(void)
             QEMU_CAPS_SCSI_DISK_WWN);
     DO_TEST("disk-sata-device",
             QEMU_CAPS_ICH9_AHCI);
-    DO_TEST("disk-aio",
-            QEMU_CAPS_DRIVE_AIO);
+    DO_TEST("disk-aio", NONE);
     DO_TEST("disk-source-pool", NONE);
     DO_TEST("disk-source-pool-mode", NONE);
     DO_TEST("disk-ioeventfd",