[libvirt] [PATCH 31/44] Deprecate QEMU_CAPS_DRIVE_COPY_ON_READ

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.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 | 4 +--- 31 files changed, 2 insertions(+), 39 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fc68e354e..a7899ad1e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3628,7 +3628,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ); virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 9df4be849..9c7ac5f51 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -162,7 +162,7 @@ typedef enum { /* 80 */ QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */ X_QEMU_CAPS_VIRTIO_BLK_SG_IO, /* SG_IO commands */ - QEMU_CAPS_DRIVE_COPY_ON_READ, /* -drive copy-on-read */ + X_QEMU_CAPS_DRIVE_COPY_ON_READ, /* -drive copy-on-read */ X_QEMU_CAPS_CPU_HOST, /* support for -cpu host */ QEMU_CAPS_FSDEV_WRITEOUT, /* -fsdev writeout supported */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 607e44ef0..dcb6876f6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1348,13 +1348,6 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, return -1; } - if (disk->copy_on_read && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("copy_on_read is not supported by this QEMU binary")); - return -1; - } - if (disk->discard && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_DISCARD)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index fa507f3b9..61bb5855b 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 825ac8635..0e8ebd2a6 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index f9d7babc9..9ffe77a89 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index da4cf265d..81fa3e598 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index cbf81f0f0..7f06a8329 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 306fc3089..aa09231fa 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 2ce66aff4..666da9e6d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -20,7 +20,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 72897ab8a..55a90c0fe 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='usb-hub'/> <flag name='ich9-ahci'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 0cab64717..ab0388e64 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 491f3128b..567a2ef34 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 1af994e7b..94ac5c7df 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 07d03c09b..82ddbc9c4 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -20,7 +20,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index eefb63602..7527cda32 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='usb-hub'/> <flag name='ich9-ahci'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 07bf390eb..70858eb1b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 4a7b984a5..303d1fddc 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 294a110e9..3db0b3476 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index fd95ccf56..f73c13b36 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index dc9741e76..07d3b3a19 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -22,7 +22,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 71d3ab282..bf2064d85 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='usb-hub'/> <flag name='ich9-ahci'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index cd1bb4d70..f8a7940cc 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index b0be73ce5..766ba36a9 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 6c135ab27..a2cbf61ba 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 85b57d9c3..93031654d 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index f362433d0..93a0522a9 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index d78567689..8ea49029e 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='usb-hub'/> <flag name='ich9-ahci'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index e585940ed..5de333680 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 9e9799075..bc9480c2c 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9ab5e880a..ace73c534 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -914,8 +914,7 @@ mymain(void) DO_TEST("disk-drive-cache-v2-none", NONE); DO_TEST("disk-drive-cache-directsync", NONE); DO_TEST("disk-drive-cache-unsafe", NONE); - DO_TEST("disk-drive-copy-on-read", - QEMU_CAPS_DRIVE_COPY_ON_READ); + DO_TEST("disk-drive-copy-on-read", NONE); DO_TEST("disk-drive-network-nbd", NONE); DO_TEST("disk-drive-network-nbd-export", NONE); DO_TEST("disk-drive-network-nbd-ipv6", NONE); @@ -1001,7 +1000,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_VIRTIO_BLK_SCSI); DO_TEST("disk-copy_on_read", - QEMU_CAPS_DRIVE_COPY_ON_READ, QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_VIRTIO_BLK_SCSI); DO_TEST("disk-drive-discard", -- 2.16.1