qemu: capabilities: Always assume QEMU_CAPS_DRIVE_MIRROR

qemu added the 'drive-mirror' command in v1.3.0 (d9b902db3fb71fdc)

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a0374590f63839f5ccf72cd071f7eff016a6d7b9..3184d5acd120c390e87e581bce981c15220f8284 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -962,7 +962,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY },
     { "query-spice", QEMU_CAPS_SPICE },
     { "query-vnc", QEMU_CAPS_VNC },
-    { "drive-mirror", QEMU_CAPS_DRIVE_MIRROR },
     { "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT },
     { "nbd-server-start", QEMU_CAPS_NBD_SERVER },
     { "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE },

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 4a7e5ce1434588f54ef09d4fc213c1dfdf046ff6..129807f48275b5ace3264d26b17bd0928b252d78 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -207,7 +207,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_VNC, /* Is -vnc available? */
 
     /* 115 */
-    QEMU_CAPS_DRIVE_MIRROR, /* drive-mirror monitor command */
+    X_QEMU_CAPS_DRIVE_MIRROR, /* drive-mirror monitor command */
     X_QEMU_CAPS_USB_REDIR_BOOTINDEX, /* usb-redir.bootindex */
     X_QEMU_CAPS_USB_HOST_BOOTINDEX, /* usb-host.bootindex */
     QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 28d5eb0e6fc02f7dcddd815532834bf5a2f5a1c1..cb8b683c06746e113b710fec16814b095a6ad23c 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17683,11 +17683,6 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
         qemuDomainDefValidateDiskLunSource(mirror) < 0)
         goto endjob;
 
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_MIRROR)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("block copy is not supported with this QEMU binary"));
-        goto endjob;
-    }
     if (!(flags & VIR_DOMAIN_BLOCK_COPY_TRANSIENT_JOB) &&
         vm->persistent) {
         /* XXX if qemu ever lets us start a new domain with mirroring

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 419a7293f961e230dfb1f4df956d585ef83c56e4..909086c5917831eb0f4ed1532ad4eea552ca6447 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2018,48 +2018,37 @@ qemuMigrationSrcBeginPhase(virQEMUDriverPtr driver,
     }
 
     if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) {
-        bool has_drive_mirror =  virQEMUCapsGet(priv->qemuCaps,
-                                                QEMU_CAPS_DRIVE_MIRROR);
-
         if (nmigrate_disks) {
-            if (has_drive_mirror) {
-                size_t i, j;
-                /* Check user requested only known disk targets. */
-                for (i = 0; i < nmigrate_disks; i++) {
-                    for (j = 0; j < vm->def->ndisks; j++) {
-                        if (STREQ(vm->def->disks[j]->dst, migrate_disks[i]))
-                            break;
-                    }
-
-                    if (j == vm->def->ndisks) {
-                        virReportError(VIR_ERR_INVALID_ARG,
-                                       _("disk target %s not found"),
-                                       migrate_disks[i]);
-                        goto cleanup;
-                    }
+            size_t i, j;
+            /* Check user requested only known disk targets. */
+            for (i = 0; i < nmigrate_disks; i++) {
+                for (j = 0; j < vm->def->ndisks; j++) {
+                    if (STREQ(vm->def->disks[j]->dst, migrate_disks[i]))
+                        break;
                 }
 
-                if (flags & VIR_MIGRATE_TUNNELLED) {
-                    virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                                   _("Selecting disks to migrate is not "
-                                     "implemented for tunnelled migration"));
+                if (j == vm->def->ndisks) {
+                    virReportError(VIR_ERR_INVALID_ARG,
+                                   _("disk target %s not found"),
+                                   migrate_disks[i]);
                     goto cleanup;
                 }
-            } else {
+            }
+
+            if (flags & VIR_MIGRATE_TUNNELLED) {
                 virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                               _("qemu does not support drive-mirror command"));
+                               _("Selecting disks to migrate is not "
+                                 "implemented for tunnelled migration"));
                 goto cleanup;
             }
         }
 
-        if (has_drive_mirror) {
-            /* TODO support NBD for TUNNELLED migration */
-            if (flags & VIR_MIGRATE_TUNNELLED) {
-                VIR_WARN("NBD in tunnelled migration is currently not supported");
-            } else {
-                cookieFlags |= QEMU_MIGRATION_COOKIE_NBD;
-                priv->nbdPort = 0;
-            }
+        /* TODO support NBD for TUNNELLED migration */
+        if (flags & VIR_MIGRATE_TUNNELLED) {
+            VIR_WARN("NBD in tunnelled migration is currently not supported");
+        } else {
+            cookieFlags |= QEMU_MIGRATION_COOKIE_NBD;
+            priv->nbdPort = 0;
         }
     }
 

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 178b631d824ec73428bd682bfaa4d5c9232a3295..737663ad8c1489825cedb41d2776f4c7b6acff25 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index c184bed7c3a6e239ef79bf2ed05a327797b5689a..f5abecc417f77ebd3f0ac7278577a01815a8cb49 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index c7b6d4c0f0fba22ef986467d1dc0fe3f01ad6600..91479f56a30eb0e0128dc3292d826e3157416180 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 78126d75cc7050bea6675b8f72cebf71df8b018a..02e368b0fc495dd8118677d8e83919a6104ad97a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 8665d9f69c1b2fd316066b5a20dcd8535eed3aae..bebd9c12fe59b39f2902d63a93990cfe88cadbe3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -32,7 +32,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='VGA'/>
   <flag name='device-video-primary'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 0a64ac8ec44e1df7e045e4957a6a7b4461ec5315..7a9cad4f2fb472528a6cca5da8f66730d01a1dfa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -31,7 +31,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='VGA'/>
   <flag name='device-video-primary'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index d2fcf91b82bbd545f91509ec05e47fa26bd67732..7a2d70a4a74d20d28b34723743d7a619f623375d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -18,7 +18,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='device-video-primary'/>
   <flag name='s390-sclp'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 28b56afb097831e8c031b604ec324bf0d0b41911..27e730b65b3603b0b40921859034cf9228ce7c71 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index bda8c87bfd535a7fd67940525204c86629199117..c9368c0dbe8786932f1da0d39fdfdd2209c3bb65 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -18,7 +18,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='device-video-primary'/>
   <flag name='s390-sclp'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 10ff7ed988e6f5568999f391651a247a51b286fe..9288b0994e80ada7232c833cca6f1bedcb1892ae 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index ac67b3f9bcc500f5bb7eece963a65450612cc842..e5e24f67e0eb0f286da6d2256fdf1e831e83764a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -32,7 +32,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='VGA'/>
   <flag name='device-video-primary'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index cb48b64920c988aab53e7178b77e20c82e140374..6b9ccc4715ccf1d1d598ecbb2af0690590ba5c89 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -31,7 +31,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='VGA'/>
   <flag name='device-video-primary'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 5f0b5e30b366d1561fcd462136f3d939f17b46f5..ea0b76db48f67c0d29762690d139b2f0dd56b3f3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -18,7 +18,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='device-video-primary'/>
   <flag name='s390-sclp'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 88bdd7e3769bf4336da0c3267a9b24339e53701a..a6c7369fd7d796629c638fa7fdc7fed98d73a7f3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index ec8f34eb780d152c5b9d9af9fe57e47bcf6f33b2..4fcfd9c0f34a8f03f0fd38aa7a10acb7a33104f1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 5057617602f7a950c84ea022080f40d1e934dc9c..df28f15b49f91af1c3aef6dfd9149ad993f588ed 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 38e087393a9235575f80b9e01d6e1121f6d70542..323aafcd2fb7e1281a9f5831ad1f339f315b4302 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -34,7 +34,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='VGA'/>
   <flag name='device-video-primary'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 5c448e2f1bade56c624a24227d6115f2010f5b9c..aeff5dacd4259765c669b4525d4f853034c41bee 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -31,7 +31,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='VGA'/>
   <flag name='device-video-primary'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 93c2e0faa4991f15d399a0633604f214a0c5f1d8..4d145d189c878ee2161768a51263157f2530fc28 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index b86c5e884c0887d399a1749f93a355001acef045..d000d9447fa5de525f08159b0cbb73a4133f671e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -18,7 +18,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='device-video-primary'/>
   <flag name='s390-sclp'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 3585c14d7b6bcc899fb22fa2c196112d03ac9ea9..83298dfdc1d87e0eb6cd5b44bd415cbfa4f9c02a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 81125714a215988d0054587c8d96d6220b02711d..2045556c328f79a2ef2d9ea8e7bbd52deaadb1f5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -18,7 +18,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='device-video-primary'/>
   <flag name='s390-sclp'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 6d90a6fdbfce2e6dce0225b977b809d485a54a7d..8811b827b1824221442bcea444b82c5aa792408f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 5e07a1bc1b60283135b1a881114d0c3c2e503e29..024c2d4286c2a10601c3a89559c1a138bae7b628 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -31,7 +31,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='VGA'/>
   <flag name='device-video-primary'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 9d54691148e8c357d14b1dcdbd10b524597f1645..f56311342d69e9e1d62cd1127cf13eb5e347ce47 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -18,7 +18,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='device-video-primary'/>
   <flag name='s390-sclp'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index f8b5fd0894bb7ce7357a8456b773b2a7865c57ed..5c5415ddd72c7013dae8b5054d02f6b2804816c5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 8fa798239d5ef8165070d6182f683530c2a10b73..4237453e50defdb08f173634dfc160e3e663cfa9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -31,7 +31,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='VGA'/>
   <flag name='device-video-primary'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 9418e24d48ec21b454207ad9109728e54e48ea47..8ded322bd97dcd3cd4740cd15879c0f915b6db2e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -11,7 +11,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='device-video-primary'/>
   <flag name='nbd-server'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index d05080c4f1fba7e4ae761e8745b2c153b090f6b1..e92d9ba335b5dd5c9d00224b4732925969e8b0ad 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -11,7 +11,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='device-video-primary'/>
   <flag name='nbd-server'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index 587b4485fe3bf829f0227d2c0895a5624a9094be..5bf629164f6a4e773d3012353d222516b65c9a45 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -20,7 +20,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='device-video-primary'/>
   <flag name='s390-sclp'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index a9e73ca340e1a6c4c231f2df461f7c998e5729c4..9f89b384dc8aa2401df1257d6b1d6db0f12875ed 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index d08105133fdf7c737355ddbcb517197b2ec087a9..02dbf9ce6dc2dd4f3e304cf9a9db33bbd1bb0b0c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -31,7 +31,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index df206583cf2e0f6668ef550817db611c8e6534d3..23389fb95ee4d16420f0cf56699ebb680775259c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 8ed40f733ab68b199ce11301041aa5383f7c79b5..d6ca1bbef57ac7092caadccf505a32f0316d2880 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -35,7 +35,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='VGA'/>
   <flag name='device-video-primary'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 9eae5d4d58976bfb4d4acc3bc0d41cc50d0738c1..bd7c9dc72dbe991a34f4e9821ee35b11b3789568 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -35,7 +35,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='VGA'/>
   <flag name='device-video-primary'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 5fcc1e03c75280f5ef2269ce4c4385a1c61a9578..de5956b6c3b8c96223ce5e979ef7c785f32f2f42 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -41,7 +41,6 @@
   <flag name='seccomp-sandbox'/>
   <flag name='reboot-timeout'/>
   <flag name='vnc'/>
-  <flag name='drive-mirror'/>
   <flag name='blockdev-snapshot-sync'/>
   <flag name='qxl'/>
   <flag name='VGA'/>