openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-06-05 13:42:44 +02:00
parent 22b83a54f5
commit d5654a7537
40 changed files with 5 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View File

@ -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 },

2
src/qemu/qemu_capabilities.h
View File

@ -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 */

11
src/qemu/qemu_domain.c
View File

@ -9863,17 +9863,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;
}

9
src/qemu/qemu_driver.c
View File

@ -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;

1
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
View File

@ -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'/>