[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 03/23] libqtest: Clean up how we read the QMP gre
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 03/23] libqtest: Clean up how we read the QMP greeting |
Date: |
Mon, 6 Aug 2018 08:53:24 +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>
Reviewed-by: Eric Blake <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 v3 00/23] tests: Compile-time format string checking for libqtest.h, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 08/23] libqtest: Simplify qmp_fd_vsend() a bit, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 09/23] test-qobject-input-visitor: Avoid format string ambiguity, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 13/23] cpu-plug-test: Don't pass integers as strings to device_add, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 07/23] qobject: New qobject_from_vjsonf_nofail(), qdict_from_vjsonf_nofail(), Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 03/23] libqtest: Clean up how we read the QMP greeting,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 05/23] libqtest: Document calling conventions, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 17/23] migration-test: Make wait_command() cope with '%', Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 04/23] libqtest: Remove qtest_qmp_discard_response() & friends, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 23/23] libqtest: Rename qtest_FOOv() to qtest_vFOO() for consistency, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 15/23] migration-test: Make wait_command() return the "return" member, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 22/23] libqtest: Replace qtest_startf() by qtest_initf(), Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 20/23] migration-test: Clean up string interpolation into QMP, part 3, Markus Armbruster, 2018/08/06
- [Qemu-devel] [PATCH v3 11/23] tests: Pass literal format strings directly to qmp_FOO(), Markus Armbruster, 2018/08/06