[libvirt] [PATCH 4/5] qemu: capabilities: Always assume QEMU_CAPS_DRIVE_MIRROR
Peter Krempa
pkrempa at redhat.com
Tue Apr 2 11:56:47 UTC 2019
qemu added the 'drive-mirror' command in v1.3.0 (d9b902db3fb71fdc)
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_driver.c | 5 --
src/qemu/qemu_migration.c | 53 ++++++++-----------
.../caps_1.5.3.x86_64.xml | 1 -
.../caps_1.6.0.x86_64.xml | 1 -
.../caps_1.7.0.x86_64.xml | 1 -
.../caps_2.1.1.x86_64.xml | 1 -
.../caps_2.10.0.aarch64.xml | 1 -
.../caps_2.10.0.ppc64.xml | 1 -
.../caps_2.10.0.s390x.xml | 1 -
.../caps_2.10.0.x86_64.xml | 1 -
.../caps_2.11.0.s390x.xml | 1 -
.../caps_2.11.0.x86_64.xml | 1 -
.../caps_2.12.0.aarch64.xml | 1 -
.../caps_2.12.0.ppc64.xml | 1 -
.../caps_2.12.0.s390x.xml | 1 -
.../caps_2.12.0.x86_64.xml | 1 -
.../caps_2.4.0.x86_64.xml | 1 -
.../caps_2.5.0.x86_64.xml | 1 -
.../caps_2.6.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 -
.../caps_2.6.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 -
.../caps_2.7.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 -
.../caps_2.8.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 -
.../caps_2.9.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 -
.../caps_3.0.0.riscv32.xml | 1 -
.../caps_3.0.0.riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 -
.../caps_3.0.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 -
.../caps_3.1.0.x86_64.xml | 1 -
.../caps_4.0.0.riscv32.xml | 1 -
.../caps_4.0.0.riscv64.xml | 1 -
.../caps_4.0.0.x86_64.xml | 1 -
40 files changed, 22 insertions(+), 75 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a0374590f6..3184d5acd1 100644
--- 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 4a7e5ce143..129807f482 100644
--- 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 28d5eb0e6f..cb8b683c06 100644
--- 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 419a7293f9..909086c591 100644
--- 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 178b631d82..737663ad8c 100644
--- 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 c184bed7c3..f5abecc417 100644
--- 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 c7b6d4c0f0..91479f56a3 100644
--- 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 78126d75cc..02e368b0fc 100644
--- 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 8665d9f69c..bebd9c12fe 100644
--- 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 0a64ac8ec4..7a9cad4f2f 100644
--- 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 d2fcf91b82..7a2d70a4a7 100644
--- 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 28b56afb09..27e730b65b 100644
--- 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 bda8c87bfd..c9368c0dbe 100644
--- 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 10ff7ed988..9288b0994e 100644
--- 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 ac67b3f9bc..e5e24f67e0 100644
--- 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 cb48b64920..6b9ccc4715 100644
--- 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 5f0b5e30b3..ea0b76db48 100644
--- 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 88bdd7e376..a6c7369fd7 100644
--- 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 ec8f34eb78..4fcfd9c0f3 100644
--- 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 5057617602..df28f15b49 100644
--- 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 38e087393a..323aafcd2f 100644
--- 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 5c448e2f1b..aeff5dacd4 100644
--- 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 93c2e0faa4..4d145d189c 100644
--- 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 b86c5e884c..d000d9447f 100644
--- 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 3585c14d7b..83298dfdc1 100644
--- 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 81125714a2..2045556c32 100644
--- 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 6d90a6fdbf..8811b827b1 100644
--- 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 5e07a1bc1b..024c2d4286 100644
--- 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 9d54691148..f56311342d 100644
--- 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 f8b5fd0894..5c5415ddd7 100644
--- 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 8fa798239d..4237453e50 100644
--- 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 9418e24d48..8ded322bd9 100644
--- 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 d05080c4f1..e92d9ba335 100644
--- 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 587b4485fe..5bf629164f 100644
--- 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 a9e73ca340..9f89b384dc 100644
--- 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 d08105133f..02dbf9ce6d 100644
--- 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 df206583cf..23389fb95e 100644
--- 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 8ed40f733a..d6ca1bbef5 100644
--- 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 9eae5d4d58..bd7c9dc72d 100644
--- 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 5fcc1e03c7..de5956b6c3 100644
--- 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'/>
--
2.20.1
More information about the libvir-list
mailing list