qemu: deprecate QEMU_CAPS_DRIVE_COPY_ON_READ

Implied by QEMU >= 1.2.0.

Also delete the now redundant disk-drive-copy-on-read test.

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 6b6ff7a54be42530aa7dba219d953966100991c8..37eed1f3360311cc7c205264e77bb76ce91042af 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3626,7 +3626,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 97633b1131c10621d03a7e5ff8c26a9118c56f6b..9a3a3afeb605abf3b04fe48595983e6eed6582cb 100644 (file)
--- 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 8ff1d362ab51fefc971dadbf1701dfc54717afb3..4bdf360fac38133f7bb37156b0f7d4ab037fc133 100644 (file)
--- 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.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index f9d7babc98383bbdbf472b93c57334fe96f2667b..9ffe77a8905bed5c91fd7894c4e157381e5922c7 100644 (file)
--- 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 da4cf265d436367879160e8362b0cdd2f736c794..81fa3e59884add416b0c8f4748b3adfcb8283b2a 100644 (file)
--- 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 cbf81f0f05dedbcf47652019020735b2a6eb79f5..7f06a83296c97836925dfebd8b6162668fe1e177 100644 (file)
--- 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 306fc30895edece1581253042c292a601e829b7b..aa09231fa09bb06443d3103c164f8a073a69637a 100644 (file)
--- 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 d80038c4e0a04cf9d65bddcff417503d082fb3f9..db0a79fc766b5a2b2673eda8ea961c8620325a88 100644 (file)
--- 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 c8d5818761b960bd4218b37da43d3a36ddeb479c..794a2562642e36eadcec9f71c562927c09d14654 100644 (file)
--- 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 f71dfd8647cef147a94fa4bf427657e72a319537..6354749dc27f2cdb29cd7730654bb0233ab6420f 100644 (file)
--- 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 767fa0a42eace61e980d8e55fac4a0062e429217..cc001cbbfe795e5cb30d11b1b93dd332e0718e6c 100644 (file)
--- 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 fd1952c3ccfecc67537496f4ecbb1cea36e679c4..a1d2c419cdd4b81c7287c2d692de2d8a52021829 100644 (file)
--- 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 4f3d32abf2336a71945e302b567a40cf0ad38204..947698360e986834e5a0518f249e074692bb4e13 100644 (file)
--- 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 6d15fd41026f670eacb9a423ecc850948995357d..a3900e79fbac857e7c74238eda52086d60855424 100644 (file)
--- 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 259277ae75ec2fdda6508223160ae518495f4bab..3d1c86bd119b6b6b0a869431546eba3ac63673d3 100644 (file)
--- 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 e44ae682526c6d023847d44e89b101ae626657b2..34e3fa50bd31e417e0098bacd96aaaa61b85ecfb 100644 (file)
--- 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 294a110e960d563cb79a3d1d276d133966cb05bf..3db0b3476a4bfcb64882b3a2cbbfb4519a46b7e1 100644 (file)
--- 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 fd95ccf56066e26ed45a1189d26708aaf8a2629a..f73c13b36d96386d99d266380277f84b82c10d0c 100644 (file)
--- 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 dc9741e76fa785f3b0084b57a6e5e1ab4bf4adab..07d3b3a19230e3c930d257def84fecb672ab645c 100644 (file)
--- 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 71d3ab282bb9cf84755f468b7dd724603b803505..bf2064d857a144931ae02f3f17aaa0c288e85f18 100644 (file)
--- 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 cd1bb4d7091c6d579426c43b1828c848362c70f2..f8a7940cc0f9abb7a578c30b541416b3b6038e1a 100644 (file)
--- 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 b0be73ce54e4bec06d089a1c5dea195dee5e65cf..766ba36a9b703a89a787d0b54bff85d019afb115 100644 (file)
--- 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 6c135ab27555eda6b7bbeb25f6f728f667804fbf..a2cbf61ba2356c4b09853e3083d0acfa084522f6 100644 (file)
--- 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 85b57d9c3adc5011c549d33268f1a8f1a6c5cb74..93031654da4a1831890f59c82e990e59f9135da8 100644 (file)
--- 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 f362433d0ffd0770038b4e3299291e8c1c57cafb..93a0522a9edea0c841c6a2678a6c60ee0234c097 100644 (file)
--- 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 d78567689f29dde04e7d39da714a7ed47c55eaac..8ea49029e1b120bfe018798ca9e8bf0b56eac833 100644 (file)
--- 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 e585940edce59728fe6b40fc81f8895756e6a0ad..5de33368064d52e196d54d633001ce4e71a347ff 100644 (file)
--- 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 9e97990752bde144c47110d5456ff033cac01e52..bc9480c2ce5d8bc45d332319fb4b3340a720c79d 100644 (file)
--- 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/qemuxml2argvdata/disk-drive-copy-on-read.args b/tests/qemuxml2argvdata/disk-drive-copy-on-read.args
deleted file mode 100644 (file)
index 4a5f5a9..0000000
--- a/tests/qemuxml2argvdata/disk-drive-copy-on-read.args
+++ /dev/null
@@ -1,28 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
--name QEMUGuest1 \
--S \
--M pc \
--m 214 \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot c \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,\
-copy-on-read=on \
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 7f1855782442ab2f37d016a7e55b996224b5ecdf..4d864ac616df91b96d48ce85b94a4a7c8e56c64b 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -950,8 +950,6 @@ 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-network-nbd", NONE);
     DO_TEST("disk-drive-network-nbd-export", NONE);
     DO_TEST("disk-drive-network-nbd-ipv6", NONE);
@@ -1036,7 +1034,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",