diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-08-06 08:53:24 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-08-16 08:42:06 +0200 |
| commit | be62e1724f383c9e5012732af6c4dce587a917ee (patch) | |
| tree | a03e027af209bad2bd8a50399de933346ba88e0b | |
| parent | f94648fe3d298354d9b9fa03d8eaf622d92d781f (diff) | |
libqtest: Clean up how we read the QMP greeting
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 <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180806065344.7103-4-armbru@redhat.com>
| -rw-r--r-- | tests/libqtest.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |