[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.0 10/16] qtest: Factor out qtest_qmp_receive()
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL for-2.0 10/16] qtest: Factor out qtest_qmp_receive() |
Date: |
Mon, 31 Mar 2014 23:10:56 +0200 |
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 d9e3a33..8155695 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 8268c09..8f323c7 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.
@@ -367,6 +375,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.
*
--
1.8.4.5
- [Qemu-devel] [PULL for-2.0 00/16] QOM devices patch queue 2014-03-31, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 03/16] tests: Remove unsupported tests for MinGW, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 02/16] qtest: Keep list of qtest instances for SIGABRT handler, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 04/16] tests: Skip POSIX-only tests on Windows, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 07/16] tests: Add nvme qtest, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 08/16] tests: Add virtio-9p qtest, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 06/16] nvme: Permit zero-length block devices, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 05/16] tests: Correctly skip qtest on non-POSIX hosts, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 01/16] Revert "qtest: Fix crash if SIGABRT during qtest_init()", Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 10/16] qtest: Factor out qtest_qmp_receive(),
Andreas Färber <=
- [Qemu-devel] [PULL for-2.0 11/16] pvpanic-test: Assert pause event, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 12/16] tests: Add i82801b11 qtest, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 09/16] tests: Add pvpanic qtest, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 13/16] tmp105: Read temperature in milli-celsius, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 15/16] tmp105-test: Add a second sensor and test that one, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 14/16] tmp105-test: Wrap simple building blocks for testing, Andreas Färber, 2014/03/31
- [Qemu-devel] [PULL for-2.0 16/16] tmp105-test: Test QOM property and precision, Andreas Färber, 2014/03/31