[libvirt] [PATCH 00/10] qemu: Probe events from 'query-qmp-schema'
This applies on top of: [libvirt] [PATCH v2 00/32] qemu: add support for 'device_id' of SCSI disks (blockdev-add saga) https://www.redhat.com/archives/libvir-list/2019-February/msg00098.html The last patch does _not_ fix the numbering, please see the commit message of 10/10. Peter Krempa (10): qemu: caps: Always assume QEMU_CAPS_BALLOON_EVENT qemu: Clean up usage of qemuDomainUpdateCurrentMemorySize qemu: caps: Always assume QEMU_CAPS_SEAMLESS_MIGRATION tests: qemuhotplug: Remove unused test macro DO_TEST_DETACH_EVENT tests: qemuhotplug: Use DEVICE_DELETED event in all hotunplug tests tests: qemuhotplug: Remove leftovers for non-event testing qemu: caps: Always assume QEMU_CAPS_DEVICE_DEL_EVENT qemu: caps: Always assume QEMU_CAPS_DEVICE_TRAY_MOVED qemu: caps: Probe events from 'query-qmp-schema' rather than 'query-events' qemu: caps: Don't call 'query-events' when we probe them from QMP schema src/qemu/qemu_capabilities.c | 16 +- src/qemu/qemu_capabilities.h | 8 +- src/qemu/qemu_command.c | 10 +- src/qemu/qemu_domain.c | 57 +------- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_driver.c | 23 +-- src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_migration.c | 3 +- src/qemu/qemu_process.c | 3 - .../caps_1.5.3.x86_64.xml | 4 - .../caps_1.6.0.x86_64.xml | 4 - .../caps_1.7.0.x86_64.xml | 4 - .../caps_2.1.1.x86_64.xml | 4 - .../caps_2.10.0.aarch64.replies | 122 ---------------- .../caps_2.10.0.aarch64.xml | 4 - .../caps_2.10.0.ppc64.replies | 122 ---------------- .../caps_2.10.0.ppc64.xml | 4 - .../caps_2.10.0.s390x.replies | 122 ---------------- .../caps_2.10.0.s390x.xml | 4 - .../caps_2.10.0.x86_64.replies | 122 ---------------- .../caps_2.10.0.x86_64.xml | 4 - .../caps_2.11.0.s390x.replies | 122 ---------------- .../caps_2.11.0.s390x.xml | 4 - .../caps_2.11.0.x86_64.replies | 122 ---------------- .../caps_2.11.0.x86_64.xml | 4 - .../caps_2.12.0.aarch64.replies | 128 ---------------- .../caps_2.12.0.aarch64.xml | 4 - .../caps_2.12.0.ppc64.replies | 128 ---------------- .../caps_2.12.0.ppc64.xml | 4 - .../caps_2.12.0.s390x.replies | 128 ---------------- .../caps_2.12.0.s390x.xml | 4 - .../caps_2.12.0.x86_64.replies | 128 ---------------- .../caps_2.12.0.x86_64.xml | 4 - .../caps_2.4.0.x86_64.xml | 4 - .../caps_2.5.0.x86_64.replies | 116 --------------- .../caps_2.5.0.x86_64.xml | 4 - .../caps_2.6.0.aarch64.replies | 122 ---------------- .../caps_2.6.0.aarch64.xml | 4 - .../caps_2.6.0.ppc64.replies | 122 ---------------- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 4 - .../caps_2.6.0.x86_64.replies | 122 ---------------- .../caps_2.6.0.x86_64.xml | 4 - .../caps_2.7.0.s390x.replies | 122 ---------------- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 4 - .../caps_2.7.0.x86_64.replies | 122 ---------------- .../caps_2.7.0.x86_64.xml | 4 - .../caps_2.8.0.s390x.replies | 122 ---------------- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 4 - .../caps_2.8.0.x86_64.replies | 122 ---------------- .../caps_2.8.0.x86_64.xml | 4 - .../caps_2.9.0.ppc64.replies | 122 ---------------- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 4 - .../caps_2.9.0.s390x.replies | 122 ---------------- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 4 - .../caps_2.9.0.x86_64.replies | 122 ---------------- .../caps_2.9.0.x86_64.xml | 4 - .../caps_3.0.0.ppc64.replies | 131 ----------------- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 4 - .../caps_3.0.0.riscv32.replies | 134 ----------------- .../caps_3.0.0.riscv32.xml | 4 - .../caps_3.0.0.riscv64.replies | 134 ----------------- .../caps_3.0.0.riscv64.xml | 4 - .../caps_3.0.0.s390x.replies | 134 ----------------- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 4 - .../caps_3.0.0.x86_64.replies | 134 ----------------- .../caps_3.0.0.x86_64.xml | 4 - .../caps_3.1.0.ppc64.replies | 137 ------------------ .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 4 - .../caps_3.1.0.x86_64.replies | 137 ------------------ .../caps_3.1.0.x86_64.xml | 4 - .../caps_4.0.0.riscv32.replies | 137 ------------------ .../caps_4.0.0.riscv32.xml | 4 - .../caps_4.0.0.riscv64.replies | 137 ------------------ .../caps_4.0.0.riscv64.xml | 4 - .../caps_4.0.0.x86_64.replies | 137 ------------------ .../caps_4.0.0.x86_64.xml | 4 - tests/qemuhotplugtest.c | 79 +++------- tests/qemuxml2argvdata/channel-spicevmc.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 3 +- .../graphics-spice-agent-file-xfer.args | 3 +- .../graphics-spice-agentmouse.args | 2 +- .../graphics-spice-auto-socket-cfg.args | 3 +- .../graphics-spice-auto-socket.args | 3 +- .../graphics-spice-compression.args | 3 +- .../graphics-spice-egl-headless.args | 2 +- .../graphics-spice-no-args.args | 2 +- .../graphics-spice-qxl-vga.args | 2 +- .../qemuxml2argvdata/graphics-spice-sasl.args | 2 +- .../graphics-spice-socket.args | 2 +- .../graphics-spice-timeout.args | 2 +- .../graphics-spice-usb-redir.args | 2 +- tests/qemuxml2argvdata/graphics-spice.args | 2 +- tests/qemuxml2argvdata/name-escape.args | 2 +- .../q35-virt-manager-basic.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 3 +- .../video-virtio-gpu-spice-gl.args | 2 +- 96 files changed, 80 insertions(+), 4257 deletions(-) -- 2.20.1
The event was added to qemu by commit 973603a813c5d60 which is contained in the 1.2.0 release. 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 | 43 ++----------------- src/qemu/qemu_driver.c | 16 +++---- .../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, 11 insertions(+), 87 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 01e189510b..4767f0b347 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -986,7 +986,6 @@ struct virQEMUCapsStringFlags virQEMUCapsMigration[] = { }; struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { - { "BALLOON_CHANGE", QEMU_CAPS_BALLOON_EVENT }, { "SPICE_MIGRATE_COMPLETED", QEMU_CAPS_SEAMLESS_MIGRATION }, { "DEVICE_DELETED", QEMU_CAPS_DEVICE_DEL_EVENT }, { "MIGRATION", QEMU_CAPS_MIGRATION_EVENT }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 18abd555f4..4e64abf5bc 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -183,7 +183,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DUMP_GUEST_MEMORY, /* dump-guest-memory command */ QEMU_CAPS_NEC_USB_XHCI, /* -device nec-usb-xhci */ QEMU_CAPS_VIRTIO_S390, /* -device virtio-*-s390 */ - QEMU_CAPS_BALLOON_EVENT, /* Async event for balloon changes */ + X_QEMU_CAPS_BALLOON_EVENT, /* Async event for balloon changes */ /* 100 */ X_QEMU_CAPS_NETDEV_BRIDGE, /* bridge helper support */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b6c1a0e4e5..d9da696a55 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10254,21 +10254,15 @@ qemuDomainMachineHasBuiltinIDE(const char *machine) /** * qemuDomainUpdateCurrentMemorySize: * - * Updates the current balloon size from the monitor if necessary. In case when - * the balloon is not present for the domain, the function recalculates the - * maximum size to reflect possible changes. + * In case when the balloon is not present for the domain, the function + * recalculates the maximum size to reflect possible changes. * - * Returns 0 on success and updates vm->def->mem.cur_balloon if necessary, -1 on - * error and reports libvirt error. + * Returns 0 on success and updates vm->def->mem.cur_balloon if necessary. */ int -qemuDomainUpdateCurrentMemorySize(virQEMUDriverPtr driver, +qemuDomainUpdateCurrentMemorySize(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm) { - qemuDomainObjPrivatePtr priv = vm->privateData; - unsigned long long balloon; - int ret = -1; - /* inactive domain doesn't need size update */ if (!virDomainObjIsActive(vm)) return 0; @@ -10280,35 +10274,6 @@ qemuDomainUpdateCurrentMemorySize(virQEMUDriverPtr driver, return 0; } - /* current size is always automagically updated via the event */ - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BALLOON_EVENT)) - return 0; - - /* here we need to ask the monitor */ - - /* Don't delay if someone's using the monitor, just use existing most - * recent data instead */ - if (qemuDomainJobAllowed(priv, QEMU_JOB_QUERY)) { - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) - return -1; - - if (virDomainObjCheckActive(vm) < 0) - goto endjob; - - qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorGetBalloonInfo(priv->mon, &balloon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret = -1; - - endjob: - qemuDomainObjEndJob(driver, vm); - - if (ret < 0) - return -1; - - vm->def->mem.cur_balloon = balloon; - } - return 0; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 427c1d02a8..97042a972b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20222,26 +20222,22 @@ qemuDomainGetStatsBalloon(virQEMUDriverPtr driver, int *maxparams, unsigned int privflags) { - qemuDomainObjPrivatePtr priv = dom->privateData; virDomainMemoryStatStruct stats[VIR_DOMAIN_MEMORY_STAT_NR]; int nr_stats; unsigned long long cur_balloon = 0; size_t i; - int err = 0; if (!virDomainDefHasMemballoon(dom->def)) { cur_balloon = virDomainDefGetMemoryTotal(dom->def); - } else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BALLOON_EVENT)) { - cur_balloon = dom->def->mem.cur_balloon; } else { - err = -1; + cur_balloon = dom->def->mem.cur_balloon; } - if (!err && virTypedParamsAddULLong(&record->params, - &record->nparams, - maxparams, - "balloon.current", - cur_balloon) < 0) + if (virTypedParamsAddULLong(&record->params, + &record->nparams, + maxparams, + "balloon.current", + cur_balloon) < 0) return -1; if (virTypedParamsAddULLong(&record->params, diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 6a0b123993..6c96e8b013 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 5a91592653..038173c9b9 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 0507e02cc6..f9ceeede38 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 3c268f8d7a..f2fa718c1c 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 30eafac64f..e28b8e9313 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -26,7 +26,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 1c8b5f4237..ea46831708 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -25,7 +25,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 7347eff579..9ea1885e47 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -14,7 +14,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='dump-guest-memory'/> - <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index a5b9eecf17..355f5bbf6b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index d26506bc62..f5f4ee1393 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -14,7 +14,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='dump-guest-memory'/> - <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 38ef7207e8..f42bec715c 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 67f320cc71..6d40702def 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -26,7 +26,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index e07c1fa6d6..f893ffeccd 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -25,7 +25,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 154fb44532..2502c1331b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -14,7 +14,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='dump-guest-memory'/> - <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 94e8c877a2..dd45ca2249 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 5dff12e745..1a7f19b9b6 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index e3e1ca3cad..338f9ea606 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 0371991523..df0c0dbc57 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -28,7 +28,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 9494a72e3e..d482c437ce 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -25,7 +25,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 89bdcb116c..23f9a60c95 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index e50c83950f..ccc4a738b4 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -14,7 +14,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='dump-guest-memory'/> - <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index cc555fb48a..46bfab88d0 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 6b975be02f..ea930b807d 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -14,7 +14,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='dump-guest-memory'/> - <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index f2dbfe3cde..a0c8d68ee5 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index cea056f313..1ac331a252 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -25,7 +25,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 7101f155ff..c4f3387273 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -14,7 +14,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='dump-guest-memory'/> - <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index fe900edd92..7ae0b81489 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 226023a8b2..c70e8909ce 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -25,7 +25,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 3c2028323f..17802b59e5 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -8,7 +8,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='dump-guest-memory'/> - <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index dc5a0fd42a..d06e2f8707 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -8,7 +8,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='dump-guest-memory'/> - <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index ecbdbdc716..87e9378248 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -15,7 +15,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='dump-guest-memory'/> - <flag name='balloon-event'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 01703f125c..7d77e65790 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 29ff06581a..97dbec12cf 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -25,7 +25,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index c3bb278c5a..49dfc4f9b3 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 24741a0c9e..19b7b197d2 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -28,7 +28,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 8a54767450..3ce74f9839 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -28,7 +28,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 3d4d53023e..b6b483d09c 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -32,7 +32,6 @@ <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> -- 2.20.1
On Thu, Feb 07, 2019 at 01:28:05PM +0100, Peter Krempa wrote:
The event was added to qemu by commit 973603a813c5d60 which is contained in the 1.2.0 release.
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 | 43 ++----------------- src/qemu/qemu_driver.c | 16 +++---- .../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, 11 insertions(+), 87 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Remove the uneeded attribute and return value. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 15 ++++----------- src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_driver.c | 7 ++----- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d9da696a55..ed63a6f33f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10256,25 +10256,18 @@ qemuDomainMachineHasBuiltinIDE(const char *machine) * * In case when the balloon is not present for the domain, the function * recalculates the maximum size to reflect possible changes. - * - * Returns 0 on success and updates vm->def->mem.cur_balloon if necessary. */ -int -qemuDomainUpdateCurrentMemorySize(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm) +void +qemuDomainUpdateCurrentMemorySize(virDomainObjPtr vm) { /* inactive domain doesn't need size update */ if (!virDomainObjIsActive(vm)) - return 0; + return; /* if no balloning is available, the current size equals to the current * full memory size */ - if (!virDomainDefHasMemballoon(vm->def)) { + if (!virDomainDefHasMemballoon(vm->def)) vm->def->mem.cur_balloon = virDomainDefGetMemoryTotal(vm->def); - return 0; - } - - return 0; } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index fe474170dc..6d800a6c9d 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -851,8 +851,7 @@ bool qemuDomainMachineIsPSeries(const char *machine, const virArch arch); bool qemuDomainMachineHasBuiltinIDE(const char *machine); -int qemuDomainUpdateCurrentMemorySize(virQEMUDriverPtr driver, - virDomainObjPtr vm); +void qemuDomainUpdateCurrentMemorySize(virDomainObjPtr vm); unsigned long long qemuDomainGetMemLockLimitBytes(virDomainDefPtr def); int qemuDomainAdjustMaxMemLock(virDomainObjPtr vm); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 97042a972b..af8ef05dd9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2585,7 +2585,6 @@ qemuDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { unsigned long long maxmem; - virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; @@ -2595,8 +2594,7 @@ qemuDomainGetInfo(virDomainPtr dom, if (virDomainGetInfoEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (qemuDomainUpdateCurrentMemorySize(driver, vm) < 0) - goto cleanup; + qemuDomainUpdateCurrentMemorySize(vm); memset(info, 0, sizeof(*info)); @@ -7352,8 +7350,7 @@ static char if (virDomainGetXMLDescEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if (qemuDomainUpdateCurrentMemorySize(driver, vm) < 0) - goto cleanup; + qemuDomainUpdateCurrentMemorySize(vm); if ((flags & VIR_DOMAIN_XML_MIGRATABLE)) flags |= QEMU_DOMAIN_FORMAT_LIVE_FLAGS; -- 2.20.1
On Thu, Feb 07, 2019 at 01:28:06PM +0100, Peter Krempa wrote:
Remove the uneeded attribute and return value.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_domain.c | 15 ++++----------- src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_driver.c | 7 ++----- 3 files changed, 7 insertions(+), 18 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
The event was added by qemu commit 2fdd16e239c2a2 released in v1.3.0. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 10 +++------- src/qemu/qemu_migration.c | 3 +-- 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 - tests/qemuxml2argvdata/channel-spicevmc.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 3 ++- .../graphics-spice-agent-file-xfer.args | 3 ++- tests/qemuxml2argvdata/graphics-spice-agentmouse.args | 2 +- .../graphics-spice-auto-socket-cfg.args | 3 ++- tests/qemuxml2argvdata/graphics-spice-auto-socket.args | 3 ++- tests/qemuxml2argvdata/graphics-spice-compression.args | 3 ++- .../qemuxml2argvdata/graphics-spice-egl-headless.args | 2 +- tests/qemuxml2argvdata/graphics-spice-no-args.args | 2 +- tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 2 +- tests/qemuxml2argvdata/graphics-spice-sasl.args | 2 +- tests/qemuxml2argvdata/graphics-spice-socket.args | 2 +- tests/qemuxml2argvdata/graphics-spice-timeout.args | 2 +- tests/qemuxml2argvdata/graphics-spice-usb-redir.args | 2 +- tests/qemuxml2argvdata/graphics-spice.args | 2 +- tests/qemuxml2argvdata/name-escape.args | 2 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 3 ++- tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 2 +- 59 files changed, 30 insertions(+), 66 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4767f0b347..ead26799ce 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -986,7 +986,6 @@ struct virQEMUCapsStringFlags virQEMUCapsMigration[] = { }; struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { - { "SPICE_MIGRATE_COMPLETED", QEMU_CAPS_SEAMLESS_MIGRATION }, { "DEVICE_DELETED", QEMU_CAPS_DEVICE_DEL_EVENT }, { "MIGRATION", QEMU_CAPS_MIGRATION_EVENT }, { "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4e64abf5bc..501a2e5a52 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -202,7 +202,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 110 */ QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */ X_QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */ - QEMU_CAPS_SEAMLESS_MIGRATION, /* seamless-migration for SPICE */ + X_QEMU_CAPS_SEAMLESS_MIGRATION, /* seamless-migration for SPICE */ QEMU_CAPS_BLOCK_COMMIT, /* block-commit */ QEMU_CAPS_VNC, /* Is -vnc available? */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 77018a2c4b..2dad7bec65 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8393,13 +8393,9 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, } } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) { - /* If qemu supports seamless migration turn it - * unconditionally on. If migration destination - * doesn't support it, it fallbacks to previous - * migration algorithm silently. */ - virBufferAddLit(&opt, "seamless-migration=on,"); - } + /* Turn on seamless migration unconditionally. If migration destination + * doesn't support it, it fallbacks to previous migration algorithm silently. */ + virBufferAddLit(&opt, "seamless-migration=on,"); virBufferTrim(&opt, ",", -1); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1433b2c2f3..3107a279dd 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1339,8 +1339,7 @@ qemuMigrationSrcWaitForSpice(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION) || - !priv->job.spiceMigration) + if (!priv->job.spiceMigration) return 0; VIR_DEBUG("Waiting for SPICE to finish migration"); diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 6c96e8b013..bd539e29e8 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 038173c9b9..e2f1292378 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index f9ceeede38..0f04e2b363 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index f2fa718c1c..5398075a2f 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index e28b8e9313..8f3094d608 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -33,7 +33,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index ea46831708..358e07ebf1 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -32,7 +32,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 9ea1885e47..2837c20fac 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -19,7 +19,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 355f5bbf6b..dea5f515d7 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index f5f4ee1393..38d2e40b20 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -19,7 +19,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index f42bec715c..f0236053eb 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 6d40702def..db165d9c8f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -33,7 +33,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index f893ffeccd..af8dfeb970 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -32,7 +32,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 2502c1331b..eec39e5c9e 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -19,7 +19,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index dd45ca2249..739f1df0da 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 1a7f19b9b6..bac4e00007 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 338f9ea606..46b5ef74f6 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index df0c0dbc57..4e9c8862b9 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -35,7 +35,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index d482c437ce..76eb5f5b28 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -32,7 +32,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 23f9a60c95..149bb65c78 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index ccc4a738b4..911564e223 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -19,7 +19,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 46bfab88d0..5a6ffd0edf 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index ea930b807d..8f3f141a25 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -19,7 +19,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index a0c8d68ee5..7bb9c6acb6 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 1ac331a252..8dad5a0562 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -32,7 +32,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index c4f3387273..a20d0d9bf5 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -19,7 +19,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 7ae0b81489..4692225957 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index c70e8909ce..41fec3e9c6 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -32,7 +32,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 17802b59e5..9574cdfc2d 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -12,7 +12,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index d06e2f8707..3451419434 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -12,7 +12,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 87e9378248..fb5b22f667 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 7d77e65790..63bf7f2193 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 97dbec12cf..8ea7674e0e 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -32,7 +32,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 49dfc4f9b3..2ebc6b7ee4 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 19b7b197d2..405d8ab47c 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -36,7 +36,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 3ce74f9839..2e116976aa 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -36,7 +36,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index b6b483d09c..8cf202ec1a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -42,7 +42,6 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args index f4ae7f6ef6..af8f3d55a7 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -27,6 +27,6 @@ server,nowait \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ id=channel0,name=com.redhat.spice.0 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ -tls-channel=main \ +tls-channel=main,seamless-migration=on \ -vga cirrus \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args index f151ef1637..5ab74a6559 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -41,7 +41,8 @@ addr=0x3,bootindex=2 \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ id=channel0,name=com.redhat.spice.0 \ -device usb-tablet,id=input0,bus=usb.0,port=1.2 \ --spice port=5901,tls-port=5902,addr=0.0.0.0,x509-dir=/etc/pki/libvirt-spice \ +-spice port=5901,tls-port=5902,addr=0.0.0.0,x509-dir=/etc/pki/libvirt-spice,\ +seamless-migration=on \ -vga cirrus \ -device intel-hda,id=sound0,bus=pci.0,addr=0x4 \ -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args index 1f6dac2431..636ffcb28f 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args @@ -23,7 +23,8 @@ server,nowait \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ -tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer \ +tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer,\ +seamless-migration=on \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ -global qxl-vga.vram_size=33554432 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args index 9eae477c85..b3ff22a729 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args @@ -27,6 +27,6 @@ server,nowait \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ id=channel0,name=com.redhat.spice.0 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,agent-mouse=off,\ -x509-dir=/etc/pki/libvirt-spice,tls-channel=main \ +x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on \ -vga cirrus \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args index a184bd4a6c..b2a8decbea 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args @@ -20,5 +20,6 @@ server,nowait \ -no-shutdown \ -no-acpi \ -usb \ --spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock \ +-spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock,\ +seamless-migration=on \ -vga cirrus diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args index a184bd4a6c..b2a8decbea 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args @@ -20,5 +20,6 @@ server,nowait \ -no-shutdown \ -no-acpi \ -usb \ --spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock \ +-spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock,\ +seamless-migration=on \ -vga cirrus diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args b/tests/qemuxml2argvdata/graphics-spice-compression.args index 5c81f55571..17857780b9 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/graphics-spice-compression.args @@ -24,7 +24,8 @@ server,nowait \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ image-compression=auto_glz,jpeg-wan-compression=auto,\ -zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter \ +zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,\ +seamless-migration=on \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ -global qxl-vga.vram_size=33554432 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args index c2297bc6cc..824d64fd0a 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args @@ -22,7 +22,7 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ --spice port=5903,addr=127.0.0.1 \ +-spice port=5903,addr=127.0.0.1,seamless-migration=on \ -display egl-headless \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args b/tests/qemuxml2argvdata/graphics-spice-no-args.args index e5390c1d4d..f427bab402 100644 --- a/tests/qemuxml2argvdata/graphics-spice-no-args.args +++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args @@ -20,6 +20,6 @@ server,nowait \ -no-shutdown \ -no-acpi \ -usb \ --spice port=0 \ +-spice port=0,seamless-migration=on \ -vga cirrus \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args index bc12f64a54..7acd7732e2 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args @@ -23,7 +23,7 @@ server,nowait \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ -tls-channel=main,plaintext-channel=inputs \ +tls-channel=main,plaintext-channel=inputs,seamless-migration=on \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ -global qxl-vga.vram_size=33554432 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args index 95b41ab501..664911cb5a 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.args +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args @@ -24,7 +24,7 @@ server,nowait \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,sasl,\ -x509-dir=/etc/pki/libvirt-spice,tls-channel=default \ +x509-dir=/etc/pki/libvirt-spice,tls-channel=default,seamless-migration=on \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ -global qxl-vga.vram_size=33554432 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args b/tests/qemuxml2argvdata/graphics-spice-socket.args index 053dbe7ce1..04e88aae98 100644 --- a/tests/qemuxml2argvdata/graphics-spice-socket.args +++ b/tests/qemuxml2argvdata/graphics-spice-socket.args @@ -20,5 +20,5 @@ server,nowait \ -no-shutdown \ -no-acpi \ -usb \ --spice unix,addr=/tmp/spice.sock \ +-spice unix,addr=/tmp/spice.sock,seamless-migration=on \ -vga cirrus diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args index 9e7bcd4e33..e8cd35a946 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args @@ -34,7 +34,7 @@ id=drive-ide0-1-0,readonly=on \ -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,\ addr=0x7 \ -device usb-tablet,id=input0,bus=usb.0,port=1 \ --spice port=5900,addr=127.0.0.1 \ +-spice port=5900,addr=127.0.0.1,seamless-migration=on \ -vga std \ -device AC97,id=sound0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args index 162a3d9b9f..0ae5cda562 100644 --- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args +++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args @@ -28,7 +28,7 @@ addr=0x4 \ tls-channel=main,plaintext-channel=inputs,tls-channel=usbredir,\ image-compression=auto_glz,jpeg-wan-compression=auto,\ zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,\ -disable-copy-paste \ +disable-copy-paste,seamless-migration=on \ -vga cirrus \ -chardev socket,id=charredir0,host=localhost,port=4000 \ -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2argvdata/graphics-spice.args index c2d31af8cd..afe896673e 100644 --- a/tests/qemuxml2argvdata/graphics-spice.args +++ b/tests/qemuxml2argvdata/graphics-spice.args @@ -26,7 +26,7 @@ server,nowait \ tls-channel=default,tls-channel=main,plaintext-channel=inputs,\ image-compression=auto_glz,jpeg-wan-compression=auto,\ zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,\ -disable-copy-paste,disable-agent-file-xfer \ +disable-copy-paste,disable-agent-file-xfer,seamless-migration=on \ -vga qxl \ -global qxl-vga.ram_size=67108864 \ -global qxl-vga.vram_size=33554432 \ diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvdata/name-escape.args index d0ccc01d21..b4cad57602 100644 --- a/tests/qemuxml2argvdata/name-escape.args +++ b/tests/qemuxml2argvdata/name-escape.args @@ -39,7 +39,7 @@ cert3=cert3,db=/etc/pki/nssdb,,foo,id=smartcard0,bus=ccid0.0 \ -netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \ -vnc unix:/tmp/lib/domain--1-foo=1,,bar=2/vnc.sock \ -spice unix,addr=/tmp/lib/domain--1-foo=1,,bar=2/spice.sock,gl=on,\ -rendernode=/dev/dri/foo,,bar \ +rendernode=/dev/dri/foo,,bar,seamless-migration=on \ -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ -drive file=iscsi://example.foo.org:3260/iqn.1992-01.com.example%3Amy,,\ storage/1,if=none,format=raw,id=drive-hostdev0 \ diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args index 3cd0291c9b..e9b8c0b681 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args @@ -49,7 +49,7 @@ id=channel0,name=org.qemu.guest_agent.0 \ id=channel1,name=com.redhat.spice.0 \ -device usb-tablet,id=input0,bus=usb.0,port=1 \ -spice port=5901,tls-port=5902,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ -image-compression=off \ +image-compression=off,seamless-migration=on \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pcie.0,\ addr=0x1 \ -device ich9-intel-hda,id=sound0,bus=pcie.0,addr=0x1b \ diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args index f43c003645..e5d2da6442 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.args +++ b/tests/qemuxml2argvdata/serial-spiceport.args @@ -25,7 +25,8 @@ server,nowait \ -chardev spiceport,id=charserial0,name=org.qemu.console.serial.0 \ -device isa-serial,chardev=charserial0,id=serial0 \ -device usb-tablet,id=input0,bus=usb.0,port=1 \ --spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ +seamless-migration=on \ -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\ addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args index be8af429c1..f1341e359d 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args @@ -23,6 +23,6 @@ server,nowait \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ --spice port=0,gl=on,rendernode=/dev/dri/foo \ +-spice port=0,gl=on,rendernode=/dev/dri/foo,seamless-migration=on \ -device virtio-gpu-pci,id=video0,virgl=on,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -- 2.20.1
On Thu, Feb 07, 2019 at 01:28:07PM +0100, Peter Krempa wrote:
The event was added by qemu commit 2fdd16e239c2a2 released in v1.3.0.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 10 +++------- src/qemu/qemu_migration.c | 3 +-- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - [...] tests/qemuxml2argvdata/graphics-spice.args | 2 +- tests/qemuxml2argvdata/name-escape.args | 2 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 3 ++- tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 2 +- 59 files changed, 30 insertions(+), 66 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
This variant is unused as we create the object including capabilities with DO_TEST_ATTACH_EVENT, which is then reused. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuhotplugtest.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index aa49097a4a..0356d87092 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -647,9 +647,6 @@ mymain(void) #define DO_TEST_ATTACH_EVENT(file, dev, fial, kep, ...) \ DO_TEST(file, ATTACH, dev, true, fial, kep, __VA_ARGS__) -#define DO_TEST_DETACH_EVENT(file, dev, fial, kep, ...) \ - DO_TEST(file, DETACH, dev, true, fial, kep, __VA_ARGS__) - #define DO_TEST_UPDATE(file, dev, fial, kep, ...) \ DO_TEST(file, UPDATE, dev, false, fial, kep, __VA_ARGS__) -- 2.20.1
On Thu, Feb 07, 2019 at 01:28:08PM +0100, Peter Krempa wrote:
This variant is unused as we create the object including capabilities with DO_TEST_ATTACH_EVENT, which is then reused.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuhotplugtest.c | 3 --- 1 file changed, 3 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Currently all supported qemu versions now have support for the DEVICE_DELETED event. This means that testing the old approach is a waste of time. Always add the QEMU_CAPS_DEVICE_DEL_EVENT capability in the hotplug test and fix existing test cases. The 'disk-virtio', 'disk-usb', 'disk-scsi', and 'disk-scsi-2' already had variants that used the event, so the non-event variants will be removed. For all other cases the QMP_DEVICE_DELETED macro is used to add the correct reply. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuhotplugtest.c | 59 +++++++++-------------------------------- 1 file changed, 12 insertions(+), 47 deletions(-) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 0356d87092..3318931b9b 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -59,7 +59,7 @@ static int qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, virDomainObjPtr *vm, const char *domxml, - bool event) + bool event ATTRIBUTE_UNUSED) { int ret = -1; qemuDomainObjPrivatePtr priv = NULL; @@ -79,8 +79,7 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SCSI_DISK_WWN); - if (event) - virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT); + virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT); if (qemuTestCapsCacheInsert(driver.qemuCapsCache, priv->qemuCaps) < 0) goto cleanup; @@ -683,16 +682,9 @@ mymain(void) "device_add", QMP_OK); DO_TEST_DETACH("console-compat-2-live", "console-virtio", false, false, - "device_del", QMP_OK, + "device_del", QMP_DEVICE_DELETED("console1") QMP_OK, "chardev-remove", QMP_OK); - DO_TEST_ATTACH("base-live", "disk-virtio", false, true, - "human-monitor-command", HMP("OK\\r\\n"), - "device_add", QMP_OK); - DO_TEST_DETACH("base-live", "disk-virtio", false, false, - "device_del", QMP_OK, - "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("base-live", "disk-virtio", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); @@ -703,13 +695,6 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH("base-live", "disk-usb", false, true, - "human-monitor-command", HMP("OK\\r\\n"), - "device_add", QMP_OK); - DO_TEST_DETACH("base-live", "disk-usb", false, false, - "device_del", QMP_OK, - "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("base-live", "disk-usb", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); @@ -720,13 +705,6 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("usb-disk16") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH("base-live", "disk-scsi", false, true, - "human-monitor-command", HMP("OK\\r\\n"), - "device_add", QMP_OK); - DO_TEST_DETACH("base-live", "disk-scsi", false, false, - "device_del", QMP_OK, - "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("base-live", "disk-scsi", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); @@ -737,19 +715,6 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("scsi0-0-0-5") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH("base-without-scsi-controller-live", "disk-scsi-2", false, true, - /* Four controllers added */ - "device_add", QMP_OK, - "device_add", QMP_OK, - "device_add", QMP_OK, - "device_add", QMP_OK, - "human-monitor-command", HMP("OK\\r\\n"), - /* Disk added */ - "device_add", QMP_OK); - DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", false, false, - "device_del", QMP_OK, - "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("base-without-scsi-controller-live", "disk-scsi-2", false, true, /* Four controllers added */ "device_add", QMP_OK, @@ -770,14 +735,14 @@ mymain(void) "chardev-add", QMP_OK, "device_add", QMP_OK); DO_TEST_DETACH("base-live", "qemu-agent-detach", false, false, - "device_del", QMP_OK, + "device_del", QMP_DEVICE_DELETED("channel0") QMP_OK, "chardev-remove", QMP_OK); DO_TEST_ATTACH("base-ccw-live", "ccw-virtio", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); DO_TEST_DETACH("base-ccw-live", "ccw-virtio", false, false, - "device_del", QMP_OK, + "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH("base-ccw-live-with-ccw-virtio", "ccw-virtio-2", false, true, @@ -785,7 +750,7 @@ mymain(void) "device_add", QMP_OK); DO_TEST_DETACH("base-ccw-live-with-ccw-virtio", "ccw-virtio-2", false, false, - "device_del", QMP_OK, + "device_del", QMP_DEVICE_DELETED("virtio-disk0") QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH("base-ccw-live-with-ccw-virtio", "ccw-virtio-2-explicit", false, true, @@ -793,7 +758,7 @@ mymain(void) "device_add", QMP_OK); DO_TEST_DETACH("base-ccw-live-with-ccw-virtio", "ccw-virtio-2-explicit", false, false, - "device_del", QMP_OK, + "device_del", QMP_DEVICE_DELETED("virtio-disk0") QMP_OK, "human-monitor-command", HMP("")); /* Attach a second device, then detach the first one. Then attach the first one again. */ @@ -802,7 +767,7 @@ mymain(void) "device_add", QMP_OK); DO_TEST_DETACH("base-ccw-live-with-2-ccw-virtio", "ccw-virtio-1-explicit", false, true, - "device_del", QMP_OK, + "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK, "human-monitor-command", HMP("")); DO_TEST_ATTACH("base-ccw-live-with-2-ccw-virtio", "ccw-virtio-1-reverse", false, false, @@ -816,10 +781,10 @@ mymain(void) "chardev-add", QMP_OK, "device_add", QMP_OK); DO_TEST_DETACH("base-live+ivshmem-plain", "ivshmem-doorbell-detach", false, true, - "device_del", QMP_OK, + "device_del", QMP_DEVICE_DELETED("shmem1") QMP_OK, "chardev-remove", QMP_OK); DO_TEST_DETACH("base-live", "ivshmem-plain-detach", false, false, - "device_del", QMP_OK, + "device_del", QMP_DEVICE_DELETED("shmem0") QMP_OK, "object-del", QMP_OK); DO_TEST_ATTACH("base-live+disk-scsi-wwn", "disk-scsi-duplicate-wwn", false, false, @@ -830,13 +795,13 @@ mymain(void) "watchdog-set-action", QMP_OK, "device_add", QMP_OK); DO_TEST_DETACH("base-live", "watchdog-full", false, false, - "device_del", QMP_OK); + "device_del", QMP_DEVICE_DELETED("watchdog0") QMP_OK); DO_TEST_ATTACH("base-live", "watchdog-user-alias", false, true, "watchdog-set-action", QMP_OK, "device_add", QMP_OK); DO_TEST_DETACH("base-live", "watchdog-user-alias-full", false, false, - "device_del", QMP_OK); + "device_del", QMP_DEVICE_DELETED("ua-UserWatchdog") QMP_OK); #define DO_TEST_CPU_GROUP(prefix, vcpus, modernhp, expectfail) \ do { \ -- 2.20.1
On Thu, Feb 07, 2019 at 01:28:09PM +0100, Peter Krempa wrote:
Currently all supported qemu versions now have support for the DEVICE_DELETED event. This means that testing the old approach is a waste of time.
Always add the QEMU_CAPS_DEVICE_DEL_EVENT capability in the hotplug test and fix existing test cases.
The 'disk-virtio', 'disk-usb', 'disk-scsi', and 'disk-scsi-2' already had variants that used the event, so the non-event variants will be removed.
For all other cases the QMP_DEVICE_DELETED macro is used to add the correct reply.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuhotplugtest.c | 59 +++++++++-------------------------------- 1 file changed, 12 insertions(+), 47 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
DO_TEST_ATTACH and DO_TEST_ATTACH_EVENT now do the same thing so we can remove the latter including the infrastructure. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuhotplugtest.c | 56 ++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 3318931b9b..cdec25fca3 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -58,8 +58,7 @@ struct qemuHotplugTestData { static int qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, virDomainObjPtr *vm, - const char *domxml, - bool event ATTRIBUTE_UNUSED) + const char *domxml) { int ret = -1; qemuDomainObjPrivatePtr priv = NULL; @@ -273,8 +272,7 @@ testQemuHotplug(const void *data) goto cleanup; } } else { - if (qemuHotplugCreateObjects(driver.xmlopt, &vm, domain_xml, - test->deviceDeletedEvent) < 0) + if (qemuHotplugCreateObjects(driver.xmlopt, &vm, domain_xml) < 0) goto cleanup; } @@ -427,7 +425,7 @@ testQemuHotplugCpuPrepare(const char *test, if (virTestLoadFile(data->file_xml_dom, &data->xml_dom) < 0) goto error; - if (qemuHotplugCreateObjects(driver.xmlopt, &data->vm, data->xml_dom, true) < 0) + if (qemuHotplugCreateObjects(driver.xmlopt, &data->vm, data->xml_dom) < 0) goto error; if (!(caps = virQEMUDriverGetCapabilities(&driver, false))) @@ -622,7 +620,7 @@ mymain(void) /* wait only 100ms for DEVICE_DELETED event */ qemuDomainRemoveDeviceWaitTime = 100; -#define DO_TEST(file, ACTION, dev, event, fial, kep, ...) \ +#define DO_TEST(file, ACTION, dev, fial, kep, ...) \ do { \ const char *my_mon[] = { __VA_ARGS__, NULL}; \ const char *name = file " " #ACTION " " dev; \ @@ -632,22 +630,18 @@ mymain(void) data.fail = fial; \ data.mon = my_mon; \ data.keep = kep; \ - data.deviceDeletedEvent = event; \ if (virTestRun(name, testQemuHotplug, &data) < 0) \ ret = -1; \ } while (0) #define DO_TEST_ATTACH(file, dev, fial, kep, ...) \ - DO_TEST(file, ATTACH, dev, false, fial, kep, __VA_ARGS__) + DO_TEST(file, ATTACH, dev, fial, kep, __VA_ARGS__) #define DO_TEST_DETACH(file, dev, fial, kep, ...) \ - DO_TEST(file, DETACH, dev, false, fial, kep, __VA_ARGS__) - -#define DO_TEST_ATTACH_EVENT(file, dev, fial, kep, ...) \ - DO_TEST(file, ATTACH, dev, true, fial, kep, __VA_ARGS__) + DO_TEST(file, DETACH, dev, fial, kep, __VA_ARGS__) #define DO_TEST_UPDATE(file, dev, fial, kep, ...) \ - DO_TEST(file, UPDATE, dev, false, fial, kep, __VA_ARGS__) + DO_TEST(file, UPDATE, dev, fial, kep, __VA_ARGS__) #define QMP_OK "{\"return\": {}}" @@ -685,9 +679,9 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("console1") QMP_OK, "chardev-remove", QMP_OK); - DO_TEST_ATTACH_EVENT("base-live", "disk-virtio", false, true, - "human-monitor-command", HMP("OK\\r\\n"), - "device_add", QMP_OK); + DO_TEST_ATTACH("base-live", "disk-virtio", false, true, + "human-monitor-command", HMP("OK\\r\\n"), + "device_add", QMP_OK); DO_TEST_DETACH("base-live", "disk-virtio", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); @@ -695,9 +689,9 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("base-live", "disk-usb", false, true, - "human-monitor-command", HMP("OK\\r\\n"), - "device_add", QMP_OK); + DO_TEST_ATTACH("base-live", "disk-usb", false, true, + "human-monitor-command", HMP("OK\\r\\n"), + "device_add", QMP_OK); DO_TEST_DETACH("base-live", "disk-usb", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); @@ -705,9 +699,9 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("usb-disk16") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("base-live", "disk-scsi", false, true, - "human-monitor-command", HMP("OK\\r\\n"), - "device_add", QMP_OK); + DO_TEST_ATTACH("base-live", "disk-scsi", false, true, + "human-monitor-command", HMP("OK\\r\\n"), + "device_add", QMP_OK); DO_TEST_DETACH("base-live", "disk-scsi", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); @@ -715,15 +709,15 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("scsi0-0-0-5") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("base-without-scsi-controller-live", "disk-scsi-2", false, true, - /* Four controllers added */ - "device_add", QMP_OK, - "device_add", QMP_OK, - "device_add", QMP_OK, - "device_add", QMP_OK, - "human-monitor-command", HMP("OK\\r\\n"), - /* Disk added */ - "device_add", QMP_OK); + DO_TEST_ATTACH("base-without-scsi-controller-live", "disk-scsi-2", false, true, + /* Four controllers added */ + "device_add", QMP_OK, + "device_add", QMP_OK, + "device_add", QMP_OK, + "device_add", QMP_OK, + "human-monitor-command", HMP("OK\\r\\n"), + /* Disk added */ + "device_add", QMP_OK); DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); -- 2.20.1
On Thu, Feb 07, 2019 at 01:28:10PM +0100, Peter Krempa wrote:
DO_TEST_ATTACH and DO_TEST_ATTACH_EVENT now do the same thing so we can remove the latter including the infrastructure.
Bye, leftovers!
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuhotplugtest.c | 56 ++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 31 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
DEVICE_DELETED was added in qemu commit 0402a5d65ec00 which was released in v1.5.0. 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 | 3 --- src/qemu/qemu_hotplug.c | 10 +--------- src/qemu/qemu_process.c | 3 --- 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 - tests/qemuhotplugtest.c | 1 - 42 files changed, 2 insertions(+), 54 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ead26799ce..108be4cec9 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -986,7 +986,6 @@ struct virQEMUCapsStringFlags virQEMUCapsMigration[] = { }; struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { - { "DEVICE_DELETED", QEMU_CAPS_DEVICE_DEL_EVENT }, { "MIGRATION", QEMU_CAPS_MIGRATION_EVENT }, { "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE }, { "DEVICE_TRAY_MOVED", QEMU_CAPS_DEVICE_TRAY_MOVED }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 501a2e5a52..3b20a877d3 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -257,7 +257,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 150 */ X_QEMU_CAPS_VNC_SHARE_POLICY, /* set display sharing policy */ - QEMU_CAPS_DEVICE_DEL_EVENT, /* DEVICE_DELETED event */ + X_QEMU_CAPS_DEVICE_DEL_EVENT, /* DEVICE_DELETED event */ QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */ QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */ QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ed63a6f33f..15aba3cb0a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9478,9 +9478,6 @@ qemuDomainUpdateDeviceList(virQEMUDriverPtr driver, char **aliases; int rc; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT)) - return 0; - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; rc = qemuMonitorGetDeviceAliases(priv->mon, &aliases); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 2497cd0fef..6e76aef6db 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5116,9 +5116,6 @@ qemuDomainMarkDeviceAliasForRemoval(virDomainObjPtr vm, memset(&priv->unplug, 0, sizeof(priv->unplug)); - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT)) - return; - priv->unplug.alias = alias; } @@ -5142,11 +5139,9 @@ qemuDomainResetDeviceRemoval(virDomainObjPtr vm) /* Returns: * -1 Unplug of the device failed * - * 0 DEVICE_DELETED event is supported and removal of the device did not - * finish in qemuDomainRemoveDeviceWaitTime + * 0 removal of the device did not finish in qemuDomainRemoveDeviceWaitTime * * 1 when the caller is responsible for finishing the device removal: - * - DEVICE_DELETED event is unsupported * - DEVICE_DELETED event arrived before the timeout time * - we failed to reliably wait for the event and thus use fallback behavior */ @@ -5157,9 +5152,6 @@ qemuDomainWaitForDeviceRemoval(virDomainObjPtr vm) unsigned long long until; int rc; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT)) - return 1; - if (virTimeMillisNow(&until) < 0) return 1; until += qemuDomainRemoveDeviceWaitTime; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0583eb03f2..7536c1cbb0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3635,9 +3635,6 @@ qemuProcessUpdateDevices(virQEMUDriverPtr driver, char **tmp; int ret = -1; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT)) - return 0; - old = priv->qemuDevices; priv->qemuDevices = NULL; if (qemuDomainUpdateDeviceList(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index bd539e29e8..75c7bcfeb0 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -61,7 +61,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index e2f1292378..fc9bc435ec 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -61,7 +61,6 @@ <flag name='vfio-pci'/> <flag name='mem-merge'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 0f04e2b363..d40431374a 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -62,7 +62,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 5398075a2f..cfe6a7be9f 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 8f3094d608..5e5579e969 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -50,7 +50,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 358e07ebf1..e289afa364 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -50,7 +50,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 2837c20fac..5af438c2a6 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> <flag name='msg-timestamp'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index dea5f515d7..9f008bb147 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 38d2e40b20..7c668957b2 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> <flag name='msg-timestamp'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index f0236053eb..3ddf445b59 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index db165d9c8f..b1d1891f64 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -50,7 +50,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index af8dfeb970..3656de5e81 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -50,7 +50,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index eec39e5c9e..5dd7b4f7f3 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> <flag name='msg-timestamp'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 739f1df0da..5d4ef49ecd 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index bac4e00007..37f9d08842 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 46b5ef74f6..5d249ed1a8 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 4e9c8862b9..70576ec3a2 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -52,7 +52,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 76eb5f5b28..ab3b8ab994 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -50,7 +50,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 149bb65c78..e0b086303e 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 911564e223..848c43d8d6 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> <flag name='msg-timestamp'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 5a6ffd0edf..24c3d7c72c 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 8f3f141a25..6b37130a05 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> <flag name='msg-timestamp'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 7bb9c6acb6..27a5d7ae67 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 8dad5a0562..ac1bb33095 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -50,7 +50,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index a20d0d9bf5..c2738d186c 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> <flag name='msg-timestamp'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 4692225957..72dfaebf8c 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 41fec3e9c6..9780abc8e5 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -50,7 +50,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 9574cdfc2d..09e826113a 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -25,7 +25,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> <flag name='msg-timestamp'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 3451419434..093dcb4c0f 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -25,7 +25,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> <flag name='msg-timestamp'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index fb5b22f667..00d931971c 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='boot-strict'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 63bf7f2193..77d2d959c5 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 8ea7674e0e..ecdb9bb59d 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -51,7 +51,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 2ebc6b7ee4..48a4b10e67 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 405d8ab47c..c7d28f6c95 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -54,7 +54,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 2e116976aa..a4c0d6b32b 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -54,7 +54,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 8cf202ec1a..495112576a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -64,7 +64,6 @@ <flag name='mem-merge'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index cdec25fca3..6d70d5897f 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -78,7 +78,6 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SCSI_DISK_WWN); - virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT); if (qemuTestCapsCacheInsert(driver.qemuCapsCache, priv->qemuCaps) < 0) goto cleanup; -- 2.20.1
On Thu, Feb 07, 2019 at 01:28:11PM +0100, Peter Krempa wrote:
DEVICE_DELETED was added in qemu commit 0402a5d65ec00 which was released in v1.5.0.
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 | 3 --- src/qemu/qemu_hotplug.c | 10 +--------- src/qemu/qemu_process.c | 3 --- 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 - tests/qemuhotplugtest.c | 1 - 42 files changed, 2 insertions(+), 54 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
The event was added by qemu commit 6f382ed226f3 released in v1.1. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_hotplug.c | 5 ++--- 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, 3 insertions(+), 41 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 108be4cec9..7f3f87c48d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -988,7 +988,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 }, }; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3b20a877d3..776b95afd9 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -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= */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6e76aef6db..38600b33f8 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -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; diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 75c7bcfeb0..b54b438f63 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index fc9bc435ec..4754467ce7 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index d40431374a..84d9777f68 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index cfe6a7be9f..c632a1332b 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 5e5579e969..6c537567cd 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index e289afa364..ca481f84ce 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 5af438c2a6..dced5b51f9 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 9f008bb147..2b40d0e28f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 7c668957b2..82daefafa0 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 3ddf445b59..25c22e34f6 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index b1d1891f64..0d22eff9b9 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 3656de5e81..c20ecbfa51 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 5dd7b4f7f3..0beb46aeb8 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 5d4ef49ecd..39cd9aebf5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 37f9d08842..9fbb010feb 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 5d249ed1a8..5bae2bd700 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 70576ec3a2..a06ca127b3 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index ab3b8ab994..a932756151 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index e0b086303e..dd1d3accf9 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 848c43d8d6..c48711eba4 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 24c3d7c72c..0106c16eaa 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 6b37130a05..232060ddff 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 27a5d7ae67..6bcb1034f8 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index ac1bb33095..2344a5f9aa 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index c2738d186c..fd1518b929 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 72dfaebf8c..360ce218f4 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 9780abc8e5..71198a608a 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 09e826113a..1ff0e12f01 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 093dcb4c0f..1f07d6ad65 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 00d931971c..b784360a6a 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 77d2d959c5..4b28962bb9 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index ecdb9bb59d..11be58b496 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 48a4b10e67..f13ef0ece2 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index c7d28f6c95..3d958db461 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index a4c0d6b32b..40083843f2 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 495112576a..70a6d2c556 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -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'/> -- 2.20.1
On Thu, Feb 07, 2019 at 01:28:12PM +0100, Peter Krempa wrote:
The event was added by qemu commit 6f382ed226f3 released in v1.1.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_hotplug.c | 5 ++--- 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, 3 insertions(+), 41 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
QEMU plans to deprecate 'query-events' as it's non-extensible. Events are also described by 'query-qmp-schema' so we can use that one instead. This patch adds detection of events to virQEMUCapsProbeQMPSchemaCapabilities using the same structure declaring them for the old approach (virQEMUCapsEvents). This is possible as the name is the same in the QMP schema and our detector supports that trivially. For any complex queries virQEMUCapsQMPSchemaQueries can be used in the future. For now we still call 'query-events' and discard the result so that it's obvious that the tests pass. This will be cleaned up later. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7f3f87c48d..9c79511b1d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2123,6 +2123,12 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps, if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) return -1; + /* we can probe events also from the QMP schema so we can skip this here */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA)) { + virStringListFreeCount(events, nevents); + return 0; + } + virQEMUCapsProcessStringFlags(qemuCaps, ARRAY_CARDINALITY(virQEMUCapsEvents), virQEMUCapsEvents, @@ -4138,6 +4144,14 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCapsPtr qemuCaps, virQEMUCapsSet(qemuCaps, entry->flag); } + /* probe also for basic event support */ + for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsEvents); i++) { + entry = virQEMUCapsEvents + i; + + if (virQEMUQAPISchemaPathExists(entry->value, schema)) + virQEMUCapsSet(qemuCaps, entry->flag); + } + virHashFree(schema); return 0; } -- 2.20.1
On 2/7/19 6:28 AM, Peter Krempa wrote:
QEMU plans to deprecate 'query-events' as it's non-extensible. Events are also described by 'query-qmp-schema' so we can use that one instead.
This patch adds detection of events to virQEMUCapsProbeQMPSchemaCapabilities using the same structure declaring them for the old approach (virQEMUCapsEvents). This is possible as the name is the same in the QMP schema and our detector supports that trivially.
For any complex queries virQEMUCapsQMPSchemaQueries can be used in the future.
For now we still call 'query-events' and discard the result so that it's obvious that the tests pass. This will be cleaned up later.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7f3f87c48d..9c79511b1d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2123,6 +2123,12 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps, if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) return -1;
+ /* we can probe events also from the QMP schema so we can skip this here */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA)) { + virStringListFreeCount(events, nevents); + return 0; + }
Slick. For this patch, we call query-events unconditionally (as before), but when qemu is new enough to also have introspection, we throw away the results without using them...
+ virQEMUCapsProcessStringFlags(qemuCaps, ARRAY_CARDINALITY(virQEMUCapsEvents), virQEMUCapsEvents, @@ -4138,6 +4144,14 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCapsPtr qemuCaps, virQEMUCapsSet(qemuCaps, entry->flag); }
+ /* probe also for basic event support */ + for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsEvents); i++) { + entry = virQEMUCapsEvents + i; + + if (virQEMUQAPISchemaPathExists(entry->value, schema)) + virQEMUCapsSet(qemuCaps, entry->flag); + } +
...and rebuild the same results from the introspection. I like the split, and am glad that it was fairly trivial to update to introspection while still keeping the fallback to query-events on older qemu. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
On Thu, Feb 07, 2019 at 01:28:13PM +0100, Peter Krempa wrote:
QEMU plans to deprecate 'query-events' as it's non-extensible. Events are also described by 'query-qmp-schema' so we can use that one instead.
This patch adds detection of events to virQEMUCapsProbeQMPSchemaCapabilities using the same structure declaring them for the old approach (virQEMUCapsEvents). This is possible as the name is the same in the QMP schema and our detector supports that trivially.
For any complex queries virQEMUCapsQMPSchemaQueries can be used in the future.
For now we still call 'query-events' and discard the result so that it's obvious that the tests pass. This will be cleaned up later.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Avoid calling the command and fix test fallout. Note that for clarity and size this does not include the fix to the numbering of commands. I've used the following command to fix them and it makes tests pass: for i in tests/qemucapabilitiesdata/*.replies; do ./tests/qemucapsfixreplies $i; done --- src/qemu/qemu_capabilities.c | 10 +- .../caps_2.10.0.aarch64.replies | 122 ---------------- .../caps_2.10.0.ppc64.replies | 122 ---------------- .../caps_2.10.0.s390x.replies | 122 ---------------- .../caps_2.10.0.x86_64.replies | 122 ---------------- .../caps_2.11.0.s390x.replies | 122 ---------------- .../caps_2.11.0.x86_64.replies | 122 ---------------- .../caps_2.12.0.aarch64.replies | 128 ---------------- .../caps_2.12.0.ppc64.replies | 128 ---------------- .../caps_2.12.0.s390x.replies | 128 ---------------- .../caps_2.12.0.x86_64.replies | 128 ---------------- .../caps_2.5.0.x86_64.replies | 116 --------------- .../caps_2.6.0.aarch64.replies | 122 ---------------- .../caps_2.6.0.ppc64.replies | 122 ---------------- .../caps_2.6.0.x86_64.replies | 122 ---------------- .../caps_2.7.0.s390x.replies | 122 ---------------- .../caps_2.7.0.x86_64.replies | 122 ---------------- .../caps_2.8.0.s390x.replies | 122 ---------------- .../caps_2.8.0.x86_64.replies | 122 ---------------- .../caps_2.9.0.ppc64.replies | 122 ---------------- .../caps_2.9.0.s390x.replies | 122 ---------------- .../caps_2.9.0.x86_64.replies | 122 ---------------- .../caps_3.0.0.ppc64.replies | 131 ----------------- .../caps_3.0.0.riscv32.replies | 134 ----------------- .../caps_3.0.0.riscv64.replies | 134 ----------------- .../caps_3.0.0.s390x.replies | 134 ----------------- .../caps_3.0.0.x86_64.replies | 134 ----------------- .../caps_3.1.0.ppc64.replies | 137 ------------------ .../caps_3.1.0.x86_64.replies | 137 ------------------ .../caps_4.0.0.riscv32.replies | 137 ------------------ .../caps_4.0.0.riscv64.replies | 137 ------------------ .../caps_4.0.0.x86_64.replies | 137 ------------------ 32 files changed, 4 insertions(+), 3938 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9c79511b1d..93a06d3cd8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2120,14 +2120,12 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps, char **events = NULL; int nevents; - if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) - return -1; - /* we can probe events also from the QMP schema so we can skip this here */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA)) { - virStringListFreeCount(events, nevents); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA)) return 0; - } + + if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) + return -1; virQEMUCapsProcessStringFlags(qemuCaps, ARRAY_CARDINALITY(virQEMUCapsEvents), diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies index 61131cee46..e90a336201 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -503,128 +503,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies index 7e9229983c..a65b352e0f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -500,128 +500,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index d688e2aeef..9156de1dda 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -512,128 +512,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index c182f5fe5e..2412653c25 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -509,128 +509,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index 560c0af0c8..3edae603cc 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -521,128 +521,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index 1ed4707a23..7ef31d3259 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -518,128 +518,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 565e10047e..7fb1953836 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -536,134 +536,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index fb9fa444c8..372eb80b92 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -533,134 +533,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index ddc62a8b82..20e30e65e4 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -545,134 +545,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 132c9c9893..74232ae354 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -551,134 +551,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index dcec7217db..855b6a5413 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -467,122 +467,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies index 9df4439b05..40fd4e3332 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -470,128 +470,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index 09f2f5daa5..51c132f543 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -467,128 +467,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index b3848a67fa..7ab704271f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -473,128 +473,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index bea4007f04..893007ed11 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -479,128 +479,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index e2b5751cf7..9046cc5a38 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -482,128 +482,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index 7a874985dd..9d60ede89c 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -491,128 +491,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index a4747f746a..ae44dad047 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -485,128 +485,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies index d9319e9a59..ca8faccec7 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -491,128 +491,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index fab8534b8e..cc07c54e4a 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -503,128 +503,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index ec7747b5d7..189c60a3e3 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -500,128 +500,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "STOP" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "SHUTDOWN" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "RESUME" - }, - { - "name": "RESET" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "POWERDOWN" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index c6e5678144..41b487cd74 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -578,137 +578,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies index cf8953390a..ba7e4c47a3 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies @@ -575,140 +575,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies index b1b5784439..c151544ed4 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies @@ -575,140 +575,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies index 1b398ed4e4..4394dc40f4 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies @@ -590,140 +590,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index 558a753e13..56fe91c767 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -596,140 +596,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies index ca8c176dd3..2f675a2135 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies @@ -581,143 +581,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "COLO_EXIT" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies index 358e2a0bdf..9a63f65138 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies @@ -602,143 +602,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "COMMAND_DROPPED" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "COLO_EXIT" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies index 667159d6ab..98e54ae7ef 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies @@ -584,143 +584,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "COLO_EXIT" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "RDMA_GID_STATUS_CHANGED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies index 414707e42a..55f28c03cd 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies @@ -584,143 +584,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "COLO_EXIT" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "RDMA_GID_STATUS_CHANGED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies index f39f047f1f..a5992ee9b2 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies @@ -605,143 +605,6 @@ "id": "libvirt-5" } -{ - "execute": "query-events", - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "RTC_CHANGE" - }, - { - "name": "ACPI_DEVICE_OST" - }, - { - "name": "MEM_UNPLUG_ERROR" - }, - { - "name": "DUMP_COMPLETED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "COLO_EXIT" - }, - { - "name": "MIGRATION_PASS" - }, - { - "name": "MIGRATION" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "RDMA_GID_STATUS_CHANGED" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "VSERPORT_CHANGE" - }, - { - "name": "QUORUM_REPORT_BAD" - }, - { - "name": "QUORUM_FAILURE" - }, - { - "name": "PR_MANAGER_STATUS_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_WRITE_THRESHOLD" - }, - { - "name": "BLOCK_JOB_PENDING" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "JOB_STATUS_CHANGE" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "RESET" - }, - { - "name": "POWERDOWN" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-6" -} - { "execute": "qom-list-types", "id": "libvirt-7" -- 2.20.1
On 2/7/19 6:28 AM, Peter Krempa wrote:
Avoid calling the command and fix test fallout.
Note that for clarity and size this does not include the fix to the numbering of commands. I've used the following command to fix them and it makes tests pass:
for i in tests/qemucapabilitiesdata/*.replies; do ./tests/qemucapsfixreplies $i; done --- src/qemu/qemu_capabilities.c | 10 +- .../caps_2.10.0.aarch64.replies | 122 ---------------- .../caps_2.10.0.ppc64.replies | 122 ---------------- .../caps_2.10.0.s390x.replies | 122 ---------------- .../caps_2.10.0.x86_64.replies | 122 ---------------- .../caps_2.11.0.s390x.replies | 122 ---------------- .../caps_2.11.0.x86_64.replies | 122 ---------------- .../caps_2.12.0.aarch64.replies | 128 ---------------- .../caps_2.12.0.ppc64.replies | 128 ---------------- .../caps_2.12.0.s390x.replies | 128 ---------------- .../caps_2.12.0.x86_64.replies | 128 ---------------- .../caps_2.5.0.x86_64.replies | 116 --------------- .../caps_2.6.0.aarch64.replies | 122 ---------------- .../caps_2.6.0.ppc64.replies | 122 ---------------- .../caps_2.6.0.x86_64.replies | 122 ---------------- .../caps_2.7.0.s390x.replies | 122 ---------------- .../caps_2.7.0.x86_64.replies | 122 ---------------- .../caps_2.8.0.s390x.replies | 122 ---------------- .../caps_2.8.0.x86_64.replies | 122 ---------------- .../caps_2.9.0.ppc64.replies | 122 ---------------- .../caps_2.9.0.s390x.replies | 122 ---------------- .../caps_2.9.0.x86_64.replies | 122 ---------------- .../caps_3.0.0.ppc64.replies | 131 ----------------- .../caps_3.0.0.riscv32.replies | 134 ----------------- .../caps_3.0.0.riscv64.replies | 134 ----------------- .../caps_3.0.0.s390x.replies | 134 ----------------- .../caps_3.0.0.x86_64.replies | 134 ----------------- .../caps_3.1.0.ppc64.replies | 137 ------------------ .../caps_3.1.0.x86_64.replies | 137 ------------------ .../caps_4.0.0.riscv32.replies | 137 ------------------ .../caps_4.0.0.riscv64.replies | 137 ------------------ .../caps_4.0.0.x86_64.replies | 137 ------------------ 32 files changed, 4 insertions(+), 3938 deletions(-)
Impressive diffstat! Basically, for any pre-captured qemu output new enough to reuse introspection results, we've gotten rid of the separate query-events reply.
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9c79511b1d..93a06d3cd8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2120,14 +2120,12 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps, char **events = NULL; int nevents;
- if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) - return -1; - /* we can probe events also from the QMP schema so we can skip this here */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA)) { - virStringListFreeCount(events, nevents); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA)) return 0; - } + + if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) + return -1;
virQEMUCapsProcessStringFlags(qemuCaps, ARRAY_CARDINALITY(virQEMUCapsEvents),
Reviewed-by: Eric Blake <eblake@redhat.com> -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
On Thu, Feb 07, 2019 at 01:28:14PM +0100, Peter Krempa wrote:
Avoid calling the command and fix test fallout.
Note that for clarity and size this does not include the fix to the numbering of commands. I've used the following command to fix them and it makes tests pass:
for i in tests/qemucapabilitiesdata/*.replies; do ./tests/qemucapsfixreplies $i; done --- src/qemu/qemu_capabilities.c | 10 +- .../caps_2.10.0.aarch64.replies | 122 ---------------- .../caps_2.10.0.ppc64.replies | 122 ---------------- .../caps_2.10.0.s390x.replies | 122 ---------------- .../caps_2.10.0.x86_64.replies | 122 ---------------- .../caps_2.11.0.s390x.replies | 122 ---------------- .../caps_2.11.0.x86_64.replies | 122 ---------------- .../caps_2.12.0.aarch64.replies | 128 ---------------- .../caps_2.12.0.ppc64.replies | 128 ---------------- .../caps_2.12.0.s390x.replies | 128 ---------------- .../caps_2.12.0.x86_64.replies | 128 ---------------- .../caps_2.5.0.x86_64.replies | 116 --------------- .../caps_2.6.0.aarch64.replies | 122 ---------------- .../caps_2.6.0.ppc64.replies | 122 ---------------- .../caps_2.6.0.x86_64.replies | 122 ---------------- .../caps_2.7.0.s390x.replies | 122 ---------------- .../caps_2.7.0.x86_64.replies | 122 ---------------- .../caps_2.8.0.s390x.replies | 122 ---------------- .../caps_2.8.0.x86_64.replies | 122 ---------------- .../caps_2.9.0.ppc64.replies | 122 ---------------- .../caps_2.9.0.s390x.replies | 122 ---------------- .../caps_2.9.0.x86_64.replies | 122 ---------------- .../caps_3.0.0.ppc64.replies | 131 ----------------- .../caps_3.0.0.riscv32.replies | 134 ----------------- .../caps_3.0.0.riscv64.replies | 134 ----------------- .../caps_3.0.0.s390x.replies | 134 ----------------- .../caps_3.0.0.x86_64.replies | 134 ----------------- .../caps_3.1.0.ppc64.replies | 137 ------------------ .../caps_3.1.0.x86_64.replies | 137 ------------------ .../caps_4.0.0.riscv32.replies | 137 ------------------ .../caps_4.0.0.riscv64.replies | 137 ------------------ .../caps_4.0.0.x86_64.replies | 137 ------------------ 32 files changed, 4 insertions(+), 3938 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
On Thu, Feb 07, 2019 at 01:28:14PM +0100, Peter Krempa wrote:
Avoid calling the command and fix test fallout.
Also, there's a public bug you can reference here: https://bugzilla.redhat.com/show_bug.cgi?id=1673320 Jano
Note that for clarity and size this does not include the fix to the numbering of commands. I've used the following command to fix them and it makes tests pass:
for i in tests/qemucapabilitiesdata/*.replies; do ./tests/qemucapsfixreplies $i; done ---
participants (3)
-
Eric Blake -
Ján Tomko -
Peter Krempa