[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/20] libqtest: Clean up how we read the QMP greeti
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 04/20] libqtest: Clean up how we read the QMP greeting |
Date: |
Thu, 12 Jul 2018 13:12:05 +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>
---
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
- Re: [Qemu-devel] [PATCH 06/20] qobject: New qobject_from_vjsonf_nofail(), qdict_from_vjsonf_nofail(), (continued)
- [Qemu-devel] [PATCH 18/20] migration-test: Clean up string interpolation into QMP, part 2, Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 02/20] libqtest: Rename functions to send QMP messages, Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 14/20] migration-test: Make wait_command() return the "return" member, Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 15/20] tests: New helper qtest_qmp_receive_success(), Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 04/20] libqtest: Clean up how we read the QMP greeting,
Markus Armbruster <=
- [Qemu-devel] [PATCH 10/20] tests: Pass literal format strings directly to qmp_FOO(), Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 07/20] libqtest: Simplify qmp_fd_vsend() a bit, Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 17/20] migration-test: Clean up string interpolation into QMP, part 1, Markus Armbruster, 2018/07/12
- [Qemu-devel] [PATCH 20/20] libqtest: Enable compile-time format string checking, Markus Armbruster, 2018/07/12