From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5Gtm-0004C6-VW for qemu-devel@nongnu.org; Fri, 11 Nov 2016 13:50:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c5Gtl-0003Gd-QS for qemu-devel@nongnu.org; Fri, 11 Nov 2016 13:50:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58664) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c5Gtl-0003GJ-KR for qemu-devel@nongnu.org; Fri, 11 Nov 2016 13:50:01 -0500 From: John Snow Date: Fri, 11 Nov 2016 13:49:51 -0500 Message-Id: <1478890195-30841-6-git-send-email-jsnow@redhat.com> In-Reply-To: <1478890195-30841-1-git-send-email-jsnow@redhat.com> References: <1478890195-30841-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 5/9] libqtest: add qmp_eventwait_ref List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com Wait for an event, but return a copy so we can investigate parameters. Signed-off-by: John Snow Reviewed-by: Eric Blake Message-id: 1478553214-497-3-git-send-email-jsnow@redhat.com Signed-off-by: John Snow --- tests/libqtest.c | 13 ++++++++++--- tests/libqtest.h | 22 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index d4e6bff..6f69752 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -533,7 +533,7 @@ void qtest_qmp_discard_response(QTestState *s, const char *fmt, ...) QDECREF(response); } -void qtest_qmp_eventwait(QTestState *s, const char *event) +QDict *qtest_qmp_eventwait_ref(QTestState *s, const char *event) { QDict *response; @@ -541,13 +541,20 @@ void qtest_qmp_eventwait(QTestState *s, const char *event) response = qtest_qmp_receive(s); if ((qdict_haskey(response, "event")) && (strcmp(qdict_get_str(response, "event"), event) == 0)) { - QDECREF(response); - break; + return response; } QDECREF(response); } } +void qtest_qmp_eventwait(QTestState *s, const char *event) +{ + QDict *response; + + response = qtest_qmp_eventwait_ref(s, event); + QDECREF(response); +} + char *qtest_hmpv(QTestState *s, const char *fmt, va_list ap) { char *cmd; diff --git a/tests/libqtest.h b/tests/libqtest.h index 0224f06..90f182e 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -114,6 +114,16 @@ QDict *qtest_qmp_receive(QTestState *s); void qtest_qmp_eventwait(QTestState *s, const char *event); /** + * qtest_qmp_eventwait_ref: + * @s: #QTestState instance to operate on. + * @s: #event event to wait for. + * + * Continuosly polls for QMP responses until it receives the desired event. + * Returns a copy of the event for further investigation. + */ +QDict *qtest_qmp_eventwait_ref(QTestState *s, const char *event); + +/** * qtest_hmpv: * @s: #QTestState instance to operate on. * @fmt...: HMP command to send to QEMU @@ -559,6 +569,18 @@ static inline void qmp_eventwait(const char *event) } /** + * qmp_eventwait_ref: + * @s: #event event to wait for. + * + * Continuosly polls for QMP responses until it receives the desired event. + * Returns a copy of the event for further investigation. + */ +static inline QDict *qmp_eventwait_ref(const char *event) +{ + return qtest_qmp_eventwait_ref(global_qtest, event); +} + +/** * hmp: * @fmt...: HMP command to send to QEMU * -- 2.7.4