{"id":808922,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808922/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170901180340.30009-7-eblake@redhat.com>","date":"2017-09-01T18:03:17","name":"[v6,06/29] tests: Clean up wait for event","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"883d436570d14815e24235b77d097bf09c6c1e9b","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/1.0/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901180340.30009-7-eblake@redhat.com/mbox/","series":[{"id":1089,"url":"http://patchwork.ozlabs.org/api/1.0/series/1089/?format=json","date":"2017-09-01T18:03:12","name":"Preliminary libqtest cleanups","version":6,"mbox":"http://patchwork.ozlabs.org/series/1089/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808922/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkS5h3xfyz9s06\n\tfor ;\n\tSat, 2 Sep 2017 04:12:56 +1000 (AEST)","from localhost ([::1]:53126 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnqR4-00072P-HN\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 14:12:54 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55757)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnqIS-00077P-Dl\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:04:05 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnqIN-0001Xm-6E\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:04:00 -0400","from mx1.redhat.com ([209.132.183.28]:52816)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dnqIM-0001XW-TW\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:03:55 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 0062781E05\n\tfor ; Fri, 1 Sep 2017 18:03:54 +0000 (UTC)","from red.redhat.com (ovpn-121-149.rdu2.redhat.com [10.10.121.149])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id A87F9627DE;\n\tFri, 1 Sep 2017 18:03:50 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0062781E05","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 13:03:17 -0500","Message-Id":"<20170901180340.30009-7-eblake@redhat.com>","In-Reply-To":"<20170901180340.30009-1-eblake@redhat.com>","References":"<20170901180340.30009-1-eblake@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tFri, 01 Sep 2017 18:03:54 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v6 06/29] tests: Clean up wait for event","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"pbonzini@redhat.com, armbru@redhat.com, Gerd Hoffmann ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Markus Armbruster \n\nWe still use hacks like qmp(\"\") to wait for an event, even though we\nhave qmp_eventwait() since commit 8fe941f, and qmp_eventwait_ref()\nsince commit 7ffe312. Both commits neglected to convert all the\nexisting hacks. Make up what they missed.\n\nBonus: gets rid of empty format strings. A step towards compile-time\nformat string checking without triggering -Wformat-zero-length.\n\nSigned-off-by: Markus Armbruster \nMessage-Id: <1500645206-13559-8-git-send-email-armbru@redhat.com>\nReviewed-by: Stefan Hajnoczi \nSigned-off-by: Eric Blake \n\n---\nv4: hoist earlier in series\n---\n tests/boot-order-test.c | 2 +-\n tests/libqos/pci-pc.c | 6 +-----\n tests/tco-test.c | 3 +--\n tests/usb-hcd-uhci-test.c | 6 +-----\n tests/usb-hcd-xhci-test.c | 12 ++----------\n tests/wdt_ib700-test.c | 35 ++++++++++-------------------------\n 6 files changed, 16 insertions(+), 48 deletions(-)","diff":"diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c\nindex fc1e7941f7..9d516830dd 100644\n--- a/tests/boot-order-test.c\n+++ b/tests/boot-order-test.c\n@@ -43,7 +43,7 @@ static void test_a_boot_order(const char *machine,\n * system_reset only requests reset. We get a RESET event after\n * the actual reset completes. Need to wait for that.\n */\n- qmp_discard_response(\"\"); /* HACK: wait for event */\n+ qmp_eventwait(\"RESET\");\n actual = read_boot_order();\n g_assert_cmphex(actual, ==, expected_reboot);\n qtest_quit(global_qtest);\ndiff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c\nindex ded1c54c06..02ce49927a 100644\n--- a/tests/libqos/pci-pc.c\n+++ b/tests/libqos/pci-pc.c\n@@ -173,9 +173,5 @@ void qpci_unplug_acpi_device_test(const char *id, uint8_t slot)\n\n outb(ACPI_PCIHP_ADDR + PCI_EJ_BASE, 1 << slot);\n\n- response = qmp(\"\");\n- g_assert(response);\n- g_assert(qdict_haskey(response, \"event\"));\n- g_assert(!strcmp(qdict_get_str(response, \"event\"), \"DEVICE_DELETED\"));\n- QDECREF(response);\n+ qmp_eventwait(\"DEVICE_DELETED\");\n }\ndiff --git a/tests/tco-test.c b/tests/tco-test.c\nindex c4c264eb3d..f2ed6ed91c 100644\n--- a/tests/tco-test.c\n+++ b/tests/tco-test.c\n@@ -237,9 +237,8 @@ static void test_tco_max_timeout(void)\n\n static QDict *get_watchdog_action(void)\n {\n- QDict *ev = qmp(\"\");\n+ QDict *ev = qmp_eventwait_ref(\"WATCHDOG\");\n QDict *data;\n- g_assert(!strcmp(qdict_get_str(ev, \"event\"), \"WATCHDOG\"));\n\n data = qdict_get_qdict(ev, \"data\");\n QINCREF(data);\ndiff --git a/tests/usb-hcd-uhci-test.c b/tests/usb-hcd-uhci-test.c\nindex 5b500fedb0..0fb7f8d223 100644\n--- a/tests/usb-hcd-uhci-test.c\n+++ b/tests/usb-hcd-uhci-test.c\n@@ -68,11 +68,7 @@ static void test_usb_storage_hotplug(void)\n g_assert(!qdict_haskey(response, \"error\"));\n QDECREF(response);\n\n- response = qmp(\"\");\n- g_assert(response);\n- g_assert(qdict_haskey(response, \"event\"));\n- g_assert(!strcmp(qdict_get_str(response, \"event\"), \"DEVICE_DELETED\"));\n- QDECREF(response);\n+ qmp_eventwait(\"DEVICE_DELETED\");\n }\n\n int main(int argc, char **argv)\ndiff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c\nindex 031764da6d..c05a339894 100644\n--- a/tests/usb-hcd-xhci-test.c\n+++ b/tests/usb-hcd-xhci-test.c\n@@ -57,11 +57,7 @@ static void test_usb_uas_hotplug(void)\n g_assert(!qdict_haskey(response, \"error\"));\n QDECREF(response);\n\n- response = qmp(\"\");\n- g_assert(qdict_haskey(response, \"event\"));\n- g_assert(!strcmp(qdict_get_str(response, \"event\"), \"DEVICE_DELETED\"));\n- QDECREF(response);\n-\n+ qmp_eventwait(\"DEVICE_DELETED\");\n\n response = qmp(\"{'execute': 'device_del',\"\n \" 'arguments': {\"\n@@ -71,11 +67,7 @@ static void test_usb_uas_hotplug(void)\n g_assert(!qdict_haskey(response, \"error\"));\n QDECREF(response);\n\n- response = qmp(\"\");\n- g_assert(response);\n- g_assert(qdict_haskey(response, \"event\"));\n- g_assert(!strcmp(qdict_get_str(response, \"event\"), \"DEVICE_DELETED\"));\n- QDECREF(response);\n+ qmp_eventwait(\"DEVICE_DELETED\");\n }\n\n int main(int argc, char **argv)\ndiff --git a/tests/wdt_ib700-test.c b/tests/wdt_ib700-test.c\nindex 49f4f0c221..4fc8eeae86 100644\n--- a/tests/wdt_ib700-test.c\n+++ b/tests/wdt_ib700-test.c\n@@ -18,26 +18,10 @@ static void qmp_check_no_event(void)\n QDECREF(resp);\n }\n\n-static QDict *qmp_get_event(const char *name)\n-{\n- QDict *event = qmp(\"\");\n- QDict *data;\n- g_assert(qdict_haskey(event, \"event\"));\n- g_assert(!strcmp(qdict_get_str(event, \"event\"), name));\n-\n- if (qdict_haskey(event, \"data\")) {\n- data = qdict_get_qdict(event, \"data\");\n- QINCREF(data);\n- } else {\n- data = NULL;\n- }\n-\n- QDECREF(event);\n- return data;\n-}\n-\n static QDict *ib700_program_and_wait(QTestState *s)\n {\n+ QDict *event, *data;\n+\n clock_step(NANOSECONDS_PER_SECOND * 40);\n qmp_check_no_event();\n\n@@ -61,7 +45,11 @@ static QDict *ib700_program_and_wait(QTestState *s)\n clock_step(3 * NANOSECONDS_PER_SECOND);\n qmp_check_no_event();\n clock_step(2 * NANOSECONDS_PER_SECOND);\n- return qmp_get_event(\"WATCHDOG\");\n+ event = qmp_eventwait_ref(\"WATCHDOG\");\n+ data = qdict_get_qdict(event, \"data\");\n+ QINCREF(data);\n+ QDECREF(event);\n+ return data;\n }\n\n\n@@ -73,8 +61,7 @@ static void ib700_pause(void)\n d = ib700_program_and_wait(s);\n g_assert(!strcmp(qdict_get_str(d, \"action\"), \"pause\"));\n QDECREF(d);\n- d = qmp_get_event(\"STOP\");\n- QDECREF(d);\n+ qmp_eventwait(\"STOP\");\n qtest_end();\n }\n\n@@ -86,8 +73,7 @@ static void ib700_reset(void)\n d = ib700_program_and_wait(s);\n g_assert(!strcmp(qdict_get_str(d, \"action\"), \"reset\"));\n QDECREF(d);\n- d = qmp_get_event(\"RESET\");\n- QDECREF(d);\n+ qmp_eventwait(\"RESET\");\n qtest_end();\n }\n\n@@ -99,8 +85,7 @@ static void ib700_shutdown(void)\n d = ib700_program_and_wait(s);\n g_assert(!strcmp(qdict_get_str(d, \"action\"), \"reset\"));\n QDECREF(d);\n- d = qmp_get_event(\"SHUTDOWN\");\n- QDECREF(d);\n+ qmp_eventwait(\"SHUTDOWN\");\n qtest_end();\n }\n\n","prefixes":["v6","06/29"]}