External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-30 16:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: deprecate QEMU_CAPS_DRIVE_AIO

Browse Source 
Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Ján Tomko 2018-03-29 12:51:55 +02:00
parent 3ebce7450a
commit 0bfb93fff2
29 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View File

@ -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);

2
src/qemu/qemu_capabilities.h
View File

@ -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 */

7
src/qemu/qemu_command.c
View File

@ -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 &&

1
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
View File

@ -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'/>

4
tests/qemuxml2argvtest.c
View File

@ -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",