[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/23] libqtest: Clean up how we read the QMP gre
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 04/23] libqtest: Clean up how we read the QMP greeting |
Date: |
Fri, 27 Jul 2018 17:13:40 +0200 |
qtest_init() still uses the qtest_qmp_discard_response(s, "") hack to
receive the greeting, even though we have qtest_qmp_receive() since
commit 66e0c7b187e. Put it to use.
Bonus: gets rid of an empty format string. A step towards
compile-time format string checking without triggering
-Wformat-zero-length.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
tests/libqtest.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 071d7eb7b1..c2c08a890c 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -249,9 +249,11 @@ QTestState *qtest_init_without_qmp_handshake(bool use_oob,
QTestState *qtest_init(const char *extra_args)
{
QTestState *s = qtest_init_without_qmp_handshake(false, extra_args);
+ QDict *greeting;
/* Read the QMP greeting and then do the handshake */
- qtest_qmp_discard_response(s, "");
+ greeting = qtest_qmp_receive(s);
+ qobject_unref(greeting);
qtest_qmp_discard_response(s, "{ 'execute': 'qmp_capabilities' }");
return s;
--
2.17.1
- [Qemu-devel] [PATCH v2 01/23] libqtest: Document calling conventions, (continued)
- [Qemu-devel] [PATCH v2 01/23] libqtest: Document calling conventions, Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 10/23] tests: Pass literal format strings directly to qmp_FOO(), Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 13/23] tests: Clean up string interpolation around qtest_qmp_device_add(), Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 11/23] tests: Clean up string interpolation into QMP input (simple cases), Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 07/23] libqtest: Simplify qmp_fd_vsend() a bit, Markus Armbruster, 2018/07/27
- [Qemu-devel] [PATCH v2 04/23] libqtest: Clean up how we read the QMP greeting,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 02/23] libqtest: Rename functions to send QMP messages, Markus Armbruster, 2018/07/27