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 | 7 ------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - 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 +-- 31 files changed, 2 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 92abec25a..4c4c8b9ad 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3633,7 +3633,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 08e709099..180814e2e 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 da95625b2..64de5ab4d 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.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 0203c86ee..057005cf3 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.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_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index d808800b2..2d0748ce6 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.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.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index c32bc60a4..e62d01b59 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 aa4fab4cb..1b5342087 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 a5dcc49a7..58ba9f7ff 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 19bc333a4..407a28da8 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 c947515cb..be4230437 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 09c8ebacf..90d73f60d 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 c94161abb..b734e24b2 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 a603dee17..5cd0e6bf5 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 cb993c44e..660e4e0bc 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 ec1145192..1f274046f 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 618d16532..6bae5eab3 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 61f2f6236..25a064812 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 e0f0df55e..f65a85a82 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 a352805ec..a7b1bb59e 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 0027ecebf..f00916432 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 570fe9178..154e723c0 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 ce35dacd2..5b15b5a1a 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 415275ceb..72b74c66e 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 c51f30d2a..c644b539f 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 a0db647f6..9d3b8e10c 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 e3d8ff673..6896469a4 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 c18d19e4c..324382851 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 beda90f0e..07adc73fb 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 7e3a3fe3c..0c585d998 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 82679b611..d827a7963 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 4f32c7115..880822be6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -803,7 +803,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, @@ -997,7 +996,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 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list