[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next v3 10/15] qtest: Factor out qtest_qmp_recei
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next v3 10/15] qtest: Factor out qtest_qmp_receive() |
Date: |
Wed, 12 Mar 2014 19:28:22 +0100 |
Signed-off-by: Andreas Färber <address@hidden>
---
tests/libqtest.c | 15 ++++++++++-----
tests/libqtest.h | 18 ++++++++++++++++++
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index f587d36..fe96005 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -309,14 +309,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) {
@@ -340,6 +336,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 9deebdc..cc947a0 100644
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -83,6 +83,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.
* @num: Interrupt to observe.
@@ -383,6 +391,16 @@ static inline 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.
*
--
1.8.4.5
- [Qemu-devel] [PATCH qom-next v3 00/15] qtest: Prepare virtio, other PCI tests, Andreas Färber, 2014/03/12
- [Qemu-devel] [PATCH qom-next v3 03/15] tests: Add virtio-balloon qtest, Andreas Färber, 2014/03/12
- [Qemu-devel] [PATCH qom-next v3 01/15] tests: Clean up IndustryPack TCPI200 gcov paths, Andreas Färber, 2014/03/12
- [Qemu-devel] [PATCH qom-next v3 04/15] tests: Add virtio-rng qtest, Andreas Färber, 2014/03/12
- [Qemu-devel] [PATCH qom-next v3 02/15] tests: Add virtio-blk qtest, Andreas Färber, 2014/03/12
- [Qemu-devel] [PATCH qom-next v3 05/15] tests: Add virtio-scsi qtest, Andreas Färber, 2014/03/12
- [Qemu-devel] [PATCH qom-next v3 08/15] tests: Add virtio-console qtest, Andreas Färber, 2014/03/12
- [Qemu-devel] [PATCH qom-next v3 11/15] pvpanic-test: Assert pause event, Andreas Färber, 2014/03/12
- [Qemu-devel] [PATCH qom-next v3 10/15] qtest: Factor out qtest_qmp_receive(),
Andreas Färber <=
- [Qemu-devel] [PATCH qom-next v3 06/15] tests: Add virtio-9p qtest, Andreas Färber, 2014/03/12
- [Qemu-devel] [PATCH qom-next v3 07/15] tests: Add virtio-serial qtest, Andreas Färber, 2014/03/12
- [Qemu-devel] [PATCH qom-next v3 15/15] tests: Add spapr-pci-host-bridge qtest, Andreas Färber, 2014/03/12
- [Qemu-devel] [PATCH qom-next v3 12/15] nvme: Permit zero-length block devices, Andreas Färber, 2014/03/12