diff --git a/tests/libqtest.c b/tests/libqtest.c index d9e3a3381792b0cae9859a301f03b3611d33fea0..815569584813c8f31d847690b88bbf01bf1f5e8b 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -345,14 +345,10 @@ static void qmp_response(JSONMessageParser *parser, QList *tokens) qmp->response = (QDict *)obj; } -QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap) +QDict *qtest_qmp_receive(QTestState *s) { QMPResponseParser qmp; - /* Send QMP request */ - socket_sendf(s->qmp_fd, fmt, ap); - - /* Receive reply */ qmp.response = NULL; json_message_parser_init(&qmp.parser, qmp_response); while (!qmp.response) { @@ -376,6 +372,15 @@ QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap) return qmp.response; } +QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap) +{ + /* Send QMP request */ + socket_sendf(s->qmp_fd, fmt, ap); + + /* Receive reply */ + return qtest_qmp_receive(s); +} + QDict *qtest_qmp(QTestState *s, const char *fmt, ...) { va_list ap; diff --git a/tests/libqtest.h b/tests/libqtest.h index 8268c098bf8f85739d0679c20d47d0f00d167c66..8f323c7030c337d0f225a4f7c46ed04ded90454e 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -82,6 +82,14 @@ void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap); */ QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap); +/** + * qtest_receive: + * @s: #QTestState instance to operate on. + * + * Reads a QMP message from QEMU and returns the response. + */ +QDict *qtest_qmp_receive(QTestState *s); + /** * qtest_get_irq: * @s: #QTestState instance to operate on. @@ -366,6 +374,16 @@ QDict *qmp(const char *fmt, ...); */ void qmp_discard_response(const char *fmt, ...); +/** + * qmp_receive: + * + * Reads a QMP message from QEMU and returns the response. + */ +static inline QDict *qmp_receive(void) +{ + return qtest_qmp_receive(global_qtest); +} + /** * get_irq: * @num: Interrupt to observe.