[libvirt] [PATCH 0/5] qemu: caps: Always assume most of block job capabilities
Peter Krempa (5): qemu: capabilities: Always assume QEMU_CAPS_BLOCKJOB_ASYNC qemu: domain: drop qemuDomainSupportsBlockJobs qemu: capabilities: Always assume QEMU_CAPS_BLOCK_COMMIT qemu: capabilities: Always assume QEMU_CAPS_DRIVE_MIRROR qemu: capabilities: Always assume disk snapshot caps src/qemu/qemu_capabilities.c | 13 +---- src/qemu/qemu_capabilities.h | 10 ++-- src/qemu/qemu_domain.c | 23 -------- src/qemu/qemu_domain.h | 2 - src/qemu/qemu_driver.c | 34 ------------ src/qemu/qemu_migration.c | 53 ++++++++----------- .../caps_1.5.3.x86_64.xml | 5 -- .../caps_1.6.0.x86_64.xml | 5 -- .../caps_1.7.0.x86_64.xml | 5 -- .../caps_2.1.1.x86_64.xml | 5 -- .../caps_2.10.0.aarch64.xml | 5 -- .../caps_2.10.0.ppc64.xml | 5 -- .../caps_2.10.0.s390x.xml | 5 -- .../caps_2.10.0.x86_64.xml | 5 -- .../caps_2.11.0.s390x.xml | 5 -- .../caps_2.11.0.x86_64.xml | 5 -- .../caps_2.12.0.aarch64.xml | 5 -- .../caps_2.12.0.ppc64.xml | 5 -- .../caps_2.12.0.s390x.xml | 5 -- .../caps_2.12.0.x86_64.xml | 5 -- .../caps_2.4.0.x86_64.xml | 5 -- .../caps_2.5.0.x86_64.xml | 5 -- .../caps_2.6.0.aarch64.xml | 5 -- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 5 -- .../caps_2.6.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 5 -- .../caps_2.7.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 5 -- .../caps_2.8.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 5 -- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 5 -- .../caps_2.9.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 5 -- .../caps_3.0.0.riscv32.xml | 5 -- .../caps_3.0.0.riscv64.xml | 5 -- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 5 -- .../caps_3.0.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 5 -- .../caps_3.1.0.x86_64.xml | 5 -- .../caps_4.0.0.riscv32.xml | 5 -- .../caps_4.0.0.riscv64.xml | 5 -- .../caps_4.0.0.x86_64.xml | 5 -- 42 files changed, 27 insertions(+), 288 deletions(-) -- 2.20.1
This was detected by the presence of 'block-stream' which is present in qemu since v1.1 (db58f9c0605fa151b8c4) Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_domain.c | 11 +---------- src/qemu/qemu_driver.c | 9 +++------ 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.11.0.x86_64.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/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - 40 files changed, 5 insertions(+), 54 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b55274955e..6e83922b38 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -959,7 +959,6 @@ struct virQEMUCapsStringFlags { struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "transaction", QEMU_CAPS_TRANSACTION }, - { "block-stream", QEMU_CAPS_BLOCKJOB_ASYNC }, { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY }, { "query-spice", QEMU_CAPS_SPICE }, { "block-commit", QEMU_CAPS_BLOCK_COMMIT }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 06c7606e2f..0087ccb294 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -173,7 +173,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 90 */ X_QEMU_CAPS_BLOCKJOB_SYNC, /* old block_job_cancel, block_stream */ - QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */ + X_QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */ X_QEMU_CAPS_SCSI_CD, /* -device scsi-cd */ X_QEMU_CAPS_IDE_CD, /* -device ide-cd */ X_QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6224ddf5e8..2de726247d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9908,17 +9908,8 @@ qemuDomainGetMonitor(virDomainObjPtr vm) * returns 0. */ int -qemuDomainSupportsBlockJobs(virDomainObjPtr vm) +qemuDomainSupportsBlockJobs(virDomainObjPtr vm ATTRIBUTE_UNUSED) { - qemuDomainObjPrivatePtr priv = vm->privateData; - bool asynchronous = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC); - - if (!asynchronous) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("block jobs not supported with this QEMU binary")); - return -1; - } - return 0; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 62d8d977c5..e1e04beacb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17695,8 +17695,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, qemuDomainDefValidateDiskLunSource(mirror) < 0) goto endjob; - if (!(virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_MIRROR) && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC))) { + 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; @@ -18078,10 +18077,8 @@ qemuDomainBlockCommit(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - /* Ensure that no one backports commit to RHEL 6.2, where cancel - * behaved differently */ - if (!(virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_COMMIT) && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC))) { + + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_COMMIT)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("online commit not supported with this QEMU binary")); goto endjob; diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index d626910258..a4028d156d 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index c281cd5f7f..8772b7d3be 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index bb6c598fc2..68f015e66f 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 340a725287..a6cc1cb350 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index e8bf3cef9f..84ae8ebdeb 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -21,7 +21,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index b24e26dfc5..babc25b205 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -20,7 +20,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 6707633b14..a7debf552f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -11,7 +11,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 1e3a4d753c..97d3d9f84b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index a781af8a04..b89e956aef 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -11,7 +11,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 1ebf54baae..bf05fa7875 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 4531964c75..f4618105a1 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -21,7 +21,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 835d36425f..e35d3d09cf 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -20,7 +20,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 4988ab3fe7..9b89c3de4c 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -11,7 +11,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 301ab899bb..88c47fca1c 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='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 14de9d7b3b..fc4181fb0a 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 24f47515d4..094968cd22 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 59688ea09f..ef9ca19164 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -23,7 +23,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 0ceadb42c0..3370d187b5 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -20,7 +20,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 828ee630af..290800fe65 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 77e067e9ba..dc156b7ef5 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -11,7 +11,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 9e9aeb1449..5deba03200 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 87cc501e25..e153c3294d 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -11,7 +11,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 5eb786945b..f21df7f7b0 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 0bc61f9c2b..198ae8cd40 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -20,7 +20,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index f628417a0d..f8902013b5 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -11,7 +11,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index fe3385680a..0f0d6551f4 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 4de8f17f51..805e1af9ba 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -20,7 +20,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 669c0dd786..978bec6172 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -5,7 +5,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 7884d6c07f..d39cb5e556 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -5,7 +5,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 57d9fc6770..9ee63263da 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -12,7 +12,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index ad942520e9..79d31dca65 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 1ad1dbcdbc..848e9099f9 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -20,7 +20,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 39b910e3b1..930e71e117 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 396e3019a0..580b895e98 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -23,7 +23,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index addc6ae4d3..5b2979d284 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -23,7 +23,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index fcfc451595..b2309d6953 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> - <flag name='block-job-async'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> -- 2.20.1
It always returns true. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 14 -------------- src/qemu/qemu_domain.h | 2 -- src/qemu/qemu_driver.c | 12 ------------ 3 files changed, 28 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2de726247d..0cc6658150 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9900,20 +9900,6 @@ qemuDomainGetMonitor(virDomainObjPtr vm) } -/** - * qemuDomainSupportsBlockJobs: - * @vm: domain object - * - * Returns -1 in case when qemu does not support block jobs at all. Otherwise - * returns 0. - */ -int -qemuDomainSupportsBlockJobs(virDomainObjPtr vm ATTRIBUTE_UNUSED) -{ - return 0; -} - - /** * qemuFindAgentConfig: * @def: domain definition diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 00b497e6a6..742632f6de 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -821,8 +821,6 @@ int qemuDomainJobInfoToParams(qemuDomainJobInfoPtr jobInfo, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -int qemuDomainSupportsBlockJobs(virDomainObjPtr vm) - ATTRIBUTE_NONNULL(1); bool qemuDomainDiskBlockJobIsActive(virDomainDiskDefPtr disk); bool qemuDomainHasBlockjob(virDomainObjPtr vm, bool copy_only) ATTRIBUTE_NONNULL(1); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e1e04beacb..536d7b5760 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17194,9 +17194,6 @@ qemuDomainBlockPullCommon(virQEMUDriverPtr driver, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (qemuDomainSupportsBlockJobs(vm) < 0) - goto endjob; - if (!(disk = qemuDomainDiskByName(vm->def, path))) goto endjob; @@ -17310,9 +17307,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (qemuDomainSupportsBlockJobs(vm) < 0) - goto endjob; - if (!(disk = qemuDomainDiskByName(vm->def, path))) goto endjob; @@ -17461,9 +17455,6 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (qemuDomainSupportsBlockJobs(vm) < 0) - goto endjob; - if (!(disk = virDomainDiskByName(vm->def, path, true))) { virReportError(VIR_ERR_INVALID_ARG, _("disk %s not found in the domain"), path); @@ -17545,9 +17536,6 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (qemuDomainSupportsBlockJobs(vm) < 0) - goto endjob; - if (!(disk = qemuDomainDiskByName(vm->def, path))) goto endjob; -- 2.20.1
qemu added the 'block-commit' command in v1.3.0 (ed61fc10e8c8d2) Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 2 -- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_driver.c | 6 ------ 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.11.0.x86_64.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/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - 39 files changed, 1 insertion(+), 45 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6e83922b38..a0374590f6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -961,7 +961,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "transaction", QEMU_CAPS_TRANSACTION }, { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY }, { "query-spice", QEMU_CAPS_SPICE }, - { "block-commit", QEMU_CAPS_BLOCK_COMMIT }, { "query-vnc", QEMU_CAPS_VNC }, { "drive-mirror", QEMU_CAPS_DRIVE_MIRROR }, { "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT }, @@ -2125,7 +2124,6 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, /* Probe for active commit of qemu 2.1. We don't need to query directly * if we have QMP schema support */ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCK_COMMIT) && qemuMonitorSupportsActiveCommit(mon)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_ACTIVE_COMMIT); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0087ccb294..4a7e5ce143 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -203,7 +203,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */ X_QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */ X_QEMU_CAPS_SEAMLESS_MIGRATION, /* seamless-migration for SPICE */ - QEMU_CAPS_BLOCK_COMMIT, /* block-commit */ + X_QEMU_CAPS_BLOCK_COMMIT, /* block-commit */ QEMU_CAPS_VNC, /* Is -vnc available? */ /* 115 */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 536d7b5760..28d5eb0e6f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18066,12 +18066,6 @@ qemuDomainBlockCommit(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_COMMIT)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("online commit not supported with this QEMU binary")); - goto endjob; - } - /* Convert bandwidth MiB to bytes, if necessary */ if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES)) { if (speed > LLONG_MAX >> 20) { diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index a4028d156d..178b631d82 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 8772b7d3be..c184bed7c3 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 68f015e66f..c7b6d4c0f0 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index a6cc1cb350..78126d75cc 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 84ae8ebdeb..8665d9f69c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -31,7 +31,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index babc25b205..0a64ac8ec4 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -30,7 +30,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index a7debf552f..d2fcf91b82 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -17,7 +17,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 97d3d9f84b..28b56afb09 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index b89e956aef..bda8c87bfd 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -17,7 +17,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index bf05fa7875..10ff7ed988 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index f4618105a1..ac67b3f9bc 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -31,7 +31,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index e35d3d09cf..cb48b64920 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -30,7 +30,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 9b89c3de4c..5f0b5e30b3 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -17,7 +17,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 88c47fca1c..88bdd7e376 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index fc4181fb0a..ec8f34eb78 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 094968cd22..5057617602 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index ef9ca19164..38e087393a 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -33,7 +33,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 3370d187b5..5c448e2f1b 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -30,7 +30,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 290800fe65..93c2e0faa4 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index dc156b7ef5..b86c5e884c 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -17,7 +17,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 5deba03200..3585c14d7b 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index e153c3294d..81125714a2 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -17,7 +17,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index f21df7f7b0..6d90a6fdbf 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 198ae8cd40..5e07a1bc1b 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -30,7 +30,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index f8902013b5..9d54691148 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -17,7 +17,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 0f0d6551f4..f8b5fd0894 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 805e1af9ba..8fa798239d 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -30,7 +30,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 978bec6172..9418e24d48 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -10,7 +10,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index d39cb5e556..d05080c4f1 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -10,7 +10,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 9ee63263da..587b4485fe 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -19,7 +19,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 79d31dca65..a9e73ca340 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 848e9099f9..d08105133f 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -30,7 +30,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 930e71e117..df206583cf 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 580b895e98..8ed40f733a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -34,7 +34,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 5b2979d284..9eae5d4d58 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -34,7 +34,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index b2309d6953..5fcc1e03c7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -40,7 +40,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> <flag name='blockdev-snapshot-sync'/> -- 2.20.1
qemu added the 'drive-mirror' command in v1.3.0 (d9b902db3fb71fdc) Signed-off-by: Peter Krempa <pkrempa@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
'blockdev-snapshot-sync' is present in QEMU since v0.14.0-rc0 and 'transaction' since v1.1.0 (52e7c241ac766406f05fa) Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 9 +-------- src/qemu/qemu_capabilities.h | 4 ++-- src/qemu/qemu_driver.c | 8 -------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 2 -- tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 2 -- 39 files changed, 3 insertions(+), 90 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3184d5acd1..71d4c01296 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -801,7 +801,6 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, virCapsGuestMachinePtr *machines = NULL; size_t nmachines = 0; int ret = -1; - bool hasdisksnapshot = false; if (!binary) return 0; @@ -831,11 +830,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, if (!virCapabilitiesAddGuestFeature(guest, "deviceboot", true, false)) goto cleanup; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_SNAPSHOT)) - hasdisksnapshot = true; - - if (!virCapabilitiesAddGuestFeature(guest, "disksnapshot", hasdisksnapshot, - false)) + if (!virCapabilitiesAddGuestFeature(guest, "disksnapshot", true, false)) goto cleanup; if (virCapabilitiesAddGuestDomain(guest, @@ -958,11 +953,9 @@ struct virQEMUCapsStringFlags { struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { - { "transaction", QEMU_CAPS_TRANSACTION }, { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY }, { "query-spice", QEMU_CAPS_SPICE }, { "query-vnc", QEMU_CAPS_VNC }, - { "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT }, { "nbd-server-start", QEMU_CAPS_NBD_SERVER }, { "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE }, { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 129807f482..c6f6980684 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -169,7 +169,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_WAKEUP, /* system_wakeup monitor command */ QEMU_CAPS_SCSI_DISK_CHANNEL, /* Is scsi-disk.channel available? */ QEMU_CAPS_SCSI_BLOCK, /* -device scsi-block */ - QEMU_CAPS_TRANSACTION, /* transaction monitor command */ + X_QEMU_CAPS_TRANSACTION, /* transaction monitor command */ /* 90 */ X_QEMU_CAPS_BLOCKJOB_SYNC, /* old block_job_cancel, block_stream */ @@ -210,7 +210,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ 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 */ + X_QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */ QEMU_CAPS_DEVICE_QXL, /* -device qxl */ /* 120 */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cb8b683c06..14b4e0af1e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15395,14 +15395,6 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr driver, char *compressedpath = NULL; virQEMUSaveDataPtr data = NULL; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DISK_SNAPSHOT) || - !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("live disk snapshot not supported with this " - "QEMU binary")); - return -1; - } - /* If quiesce was requested, then issue a freeze command, and a * counterpart thaw command when it is actually sent to agent. * The command will fail if the guest is paused or the guest agent diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 737663ad8c..28b2ac25aa 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index f5abecc417..a93fd7f545 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 91479f56a3..5402c33d3a 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 02e368b0fc..0206a2a314 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index bebd9c12fe..b0a8c01223 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='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -32,7 +31,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 7a9cad4f2f..463705bd84 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='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -31,7 +30,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 7a2d70a4a7..a48367eae4 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.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -18,7 +17,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 27e730b65b..105e8840e9 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index c9368c0dbe..9919086168 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.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -18,7 +17,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 9288b0994e..2f306d790b 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index e5e24f67e0..c7e7406a44 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='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -32,7 +31,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 6b9ccc4715..d23588018a 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='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -31,7 +30,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index ea0b76db48..fc0acdc753 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.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -18,7 +17,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index a6c7369fd7..6bb5cf0f3f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 4fcfd9c0f3..7fb4d1cd93 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index df28f15b49..7941ceebb6 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 323aafcd2f..4841bbdbc5 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='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -34,7 +33,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index aeff5dacd4..d155cc180d 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='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -31,7 +30,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 4d145d189c..d682439c38 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index d000d9447f..de8176042b 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.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -18,7 +17,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 83298dfdc1..699b561bfd 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 2045556c32..2826ec3649 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.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -18,7 +17,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 8811b827b1..c2e90b2e19 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 024c2d4286..8958e4660e 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='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -31,7 +30,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index f56311342d..63be13e61c 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.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -18,7 +17,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 5c5415ddd7..0eca457063 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 4237453e50..0ca74f4785 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -31,7 +30,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 8ded322bd9..01f2b1b5c5 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -4,14 +4,12 @@ <selfvers>0</selfvers> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index e92d9ba335..2f66ae6fbf 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -4,14 +4,12 @@ <selfvers>0</selfvers> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 5bf629164f..08321e1127 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -11,7 +11,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -20,7 +19,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='device-video-primary'/> <flag name='s390-sclp'/> <flag name='nbd-server'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 9f89b384dc..90ab809c91 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 02dbf9ce6d..9ae348d704 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -31,7 +30,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='cirrus-vga'/> <flag name='device-video-primary'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 23389fb95e..d64c68ffa9 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index d6ca1bbef5..348e863528 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -22,7 +22,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -35,7 +34,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index bd7c9dc72d..e5b24ab939 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -22,7 +22,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -35,7 +34,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='VGA'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index de5956b6c3..4585ff9e07 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='transaction'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> @@ -41,7 +40,6 @@ <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> <flag name='vnc'/> - <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> <flag name='cirrus-vga'/> -- 2.20.1
On Tue, Apr 02, 2019 at 01:56:43PM +0200, Peter Krempa wrote:
Peter Krempa (5): qemu: capabilities: Always assume QEMU_CAPS_BLOCKJOB_ASYNC qemu: domain: drop qemuDomainSupportsBlockJobs qemu: capabilities: Always assume QEMU_CAPS_BLOCK_COMMIT qemu: capabilities: Always assume QEMU_CAPS_DRIVE_MIRROR qemu: capabilities: Always assume disk snapshot caps
src/qemu/qemu_capabilities.c | 13 +---- src/qemu/qemu_capabilities.h | 10 ++-- src/qemu/qemu_domain.c | 23 -------- src/qemu/qemu_domain.h | 2 - src/qemu/qemu_driver.c | 34 ------------ src/qemu/qemu_migration.c | 53 ++++++++----------- .../caps_1.5.3.x86_64.xml | 5 -- .../caps_1.6.0.x86_64.xml | 5 -- .../caps_1.7.0.x86_64.xml | 5 -- .../caps_2.1.1.x86_64.xml | 5 -- .../caps_2.10.0.aarch64.xml | 5 -- .../caps_2.10.0.ppc64.xml | 5 -- .../caps_2.10.0.s390x.xml | 5 -- .../caps_2.10.0.x86_64.xml | 5 -- .../caps_2.11.0.s390x.xml | 5 -- .../caps_2.11.0.x86_64.xml | 5 -- .../caps_2.12.0.aarch64.xml | 5 -- .../caps_2.12.0.ppc64.xml | 5 -- .../caps_2.12.0.s390x.xml | 5 -- .../caps_2.12.0.x86_64.xml | 5 -- .../caps_2.4.0.x86_64.xml | 5 -- .../caps_2.5.0.x86_64.xml | 5 -- .../caps_2.6.0.aarch64.xml | 5 -- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 5 -- .../caps_2.6.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 5 -- .../caps_2.7.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 5 -- .../caps_2.8.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 5 -- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 5 -- .../caps_2.9.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 5 -- .../caps_3.0.0.riscv32.xml | 5 -- .../caps_3.0.0.riscv64.xml | 5 -- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 5 -- .../caps_3.0.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 5 -- .../caps_3.1.0.x86_64.xml | 5 -- .../caps_4.0.0.riscv32.xml | 5 -- .../caps_4.0.0.riscv64.xml | 5 -- .../caps_4.0.0.x86_64.xml | 5 -- 42 files changed, 27 insertions(+), 288 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Peter Krempa