From 2c58c27beeba1a5be4bceeb283cbc90d4233a090 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 11 Sep 2017 12:19:48 -0500 Subject: 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 Reviewed-by: Stefan Hajnoczi Signed-off-by: Eric Blake [thuth: dropped the hunks from the usb tests - not needed anymore] Signed-off-by: Thomas Huth --- tests/libqos/pci-pc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'tests/libqos') 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"); } -- cgit v1.2.3