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

qemu: caps: Always assume QEMU_CAPS_DEVICE_TRAY_MOVED 

The event was added by qemu commit 6f382ed226f3 released in v1.1.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Peter Krempa 2019-02-07 12:17:51 +01:00
parent 8c191a9061
commit 850bb78a6e
39 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View File

@ -989,7 +989,6 @@ struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
struct virQEMUCapsStringFlags virQEMUCapsEvents[] = {
{ "MIGRATION", QEMU_CAPS_MIGRATION_EVENT },
{ "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE },
{ "DEVICE_TRAY_MOVED", QEMU_CAPS_DEVICE_TRAY_MOVED },
{ "BLOCK_WRITE_THRESHOLD", QEMU_CAPS_BLOCK_WRITE_THRESHOLD },
{ "DUMP_COMPLETED", QEMU_CAPS_DUMP_COMPLETED },
};

2
src/qemu/qemu_capabilities.h
View File

@ -356,7 +356,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 220 */
QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */
QEMU_CAPS_DEVICE_TRAY_MOVED, /* DEVICE_TRAY_MOVED event */
X_QEMU_CAPS_DEVICE_TRAY_MOVED, /* DEVICE_TRAY_MOVED event */
QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports setting */
QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, /* virtio-scsi-{pci,ccw}.iothread */
QEMU_CAPS_NAME_GUEST, /* -name guest= */

5
src/qemu/qemu_hotplug.c
View File

@ -283,9 +283,8 @@ qemuDomainChangeMediaLegacy(virQEMUDriverPtr driver,
if (qemuDomainObjExitMonitor(driver, vm) < 0)
goto cleanup;
/* If the tray is present and tray change event is supported wait for it to open. */
if (!force && diskPriv->tray &&
virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_TRAY_MOVED)) {
/* If the tray is present wait for it to open. */
if (!force && diskPriv->tray) {
rc = qemuHotplugWaitForTrayEject(vm, disk);
if (rc < 0)
goto cleanup;

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

@ -83,7 +83,6 @@
<flag name='e1000'/>
<flag name='virtio-net'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>

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

@ -88,7 +88,6 @@
<flag name='e1000'/>
<flag name='virtio-net'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>

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

@ -90,7 +90,6 @@
<flag name='e1000'/>
<flag name='virtio-net'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>

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

@ -103,7 +103,6 @@
<flag name='vserport-change-event'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='debug-threads'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>

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

@ -98,7 +98,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -93,7 +93,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -66,7 +66,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>

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

@ -126,7 +126,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -66,7 +66,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>

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

@ -126,7 +126,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -98,7 +98,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -93,7 +93,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -66,7 +66,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>

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

@ -124,7 +124,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -116,7 +116,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -120,7 +120,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -102,7 +102,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -95,7 +95,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -126,7 +126,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -68,7 +68,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>

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

@ -126,7 +126,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -68,7 +68,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>

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

@ -126,7 +126,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -93,7 +93,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -66,7 +66,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>

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

@ -126,7 +126,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -92,7 +92,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -56,7 +56,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>

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

@ -56,7 +56,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>

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

@ -68,7 +68,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>

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

@ -125,7 +125,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -93,7 +93,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -125,7 +125,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -99,7 +99,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -99,7 +99,6 @@
<flag name='chardev-logfile'/>
<flag name='debug-threads'/>
<flag name='secret'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>

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

@ -124,7 +124,6 @@
<flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/>