[libvirt] [libvirt PATCH v2 24/44] Deprecate QEMU_CAPS_DRIVE_AIO

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 7 ------- 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 | 3 +-- 29 files changed, 2 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d014b7f4ee..8ce05d59c9 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_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 fe383433c1..5a522dc21d 100644 --- 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 d4f7b98b23..7df10e8044 100644 --- 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 c32bc60a45..e62d01b593 100644 --- 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 aa4fab4cb5..1b5342087a 100644 --- 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 a5dcc49a76..58ba9f7ffe 100644 --- 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 19bc333a4c..407a28da82 100644 --- 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 bd21afd695..d237323da0 100644 --- 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 9ef5f84fb8..3515fbe6cf 100644 --- 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 2ec88ddae5..7f807638a2 100644 --- 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 fc2d4c7a4a..9ceb89d491 100644 --- 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 f87d5b9244..5e38c3dbf2 100644 --- 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 b0e9e026fa..b5cfb53bcf 100644 --- 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 10e1b2dde6..d490ce542f 100644 --- 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 29090b88ac..654f9c1b2d 100644 --- 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 a8d4a59b86..0be70bf641 100644 --- 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 a352805ec2..a7b1bb59e6 100644 --- 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 0027ecebfc..f009164325 100644 --- 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 570fe91783..154e723c07 100644 --- 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 ce35dacd25..5b15b5a1a6 100644 --- 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 415275cebf..72b74c66e4 100644 --- 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 c51f30d2a2..c644b539f5 100644 --- 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 a0db647f60..9d3b8e10c5 100644 --- 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 e3d8ff6738..6896469a44 100644 --- 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 c18d19e4ca..3243828510 100644 --- 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 beda90f0e0..07adc73fb4 100644 --- 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 7e3a3fe3c8..0c585d9983 100644 --- 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 82679b611f..d827a79635 100644 --- 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 4b463c33cb..d39b816ec9 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -841,7 +841,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, @@ -1038,7 +1037,7 @@ mymain(void) DO_TEST("disk-sata-device", QEMU_CAPS_ICH9_AHCI); DO_TEST("disk-aio", - QEMU_CAPS_DRIVE_AIO); + NONE); DO_TEST("disk-source-pool", NONE); DO_TEST("disk-source-pool-mode", NONE); DO_TEST("disk-ioeventfd", -- 2.16.1