diff options
| author | Markus Armbruster | 2017-09-11 19:19:48 +0200 |
|---|---|---|
| committer | Thomas Huth | 2018-02-14 10:08:40 +0100 |
| commit | 2c58c27beeba1a5be4bceeb283cbc90d4233a090 (patch) | |
| tree | 812da89e85c44a2967e2112b1f2a51fe3151fe92 /tests/libqos | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| download | qemu-2c58c27beeba1a5be4bceeb283cbc90d4233a090.tar.gz qemu-2c58c27beeba1a5be4bceeb283cbc90d4233a090.tar.xz qemu-2c58c27beeba1a5be4bceeb283cbc90d4233a090.zip | |
tests: Clean up wait for event
We still use hacks like qmp("") to wait for an event, even though we
have qmp_eventwait() since commit 8fe941f, and qmp_eventwait_ref()
since commit 7ffe312. Both commits neglected to convert all the
existing hacks. Make up what they missed.
Bonus: gets rid of empty format strings. A step towards compile-time
format string checking without triggering -Wformat-zero-length.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
[thuth: dropped the hunks from the usb tests - not needed anymore]
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/libqos')
| -rw-r--r-- | tests/libqos/pci-pc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c index cd4e20e1ea..368a8a61de 100644 --- a/tests/libqos/pci-pc.c +++ b/tests/libqos/pci-pc.c @@ -173,9 +173,5 @@ void qpci_unplug_acpi_device_test(const char *id, uint8_t slot) outb(ACPI_PCIHP_ADDR + PCI_EJ_BASE, 1 << slot); - response = qmp(""); - g_assert(response); - g_assert(qdict_haskey(response, "event")); - g_assert(!strcmp(qdict_get_str(response, "event"), "DEVICE_DELETED")); - QDECREF(response); + qmp_eventwait("DEVICE_DELETED"); } |