[libvirt] [PATCH 1/5] qemu: capabilities: Always assume QEMU_CAPS_BLOCKJOB_ASYNC

This was detected by the presence of 'block-stream' which is present in qemu since v1.1 (db58f9c0605fa151b8c4) Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- 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