From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYYN2-0007fx-Te for qemu-devel@nongnu.org; Fri, 21 Jul 2017 09:53:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYYN1-000466-Cr for qemu-devel@nongnu.org; Fri, 21 Jul 2017 09:53:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38078) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dYYN1-00045O-71 for qemu-devel@nongnu.org; Fri, 21 Jul 2017 09:53:31 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 33D251E2ED for ; Fri, 21 Jul 2017 13:53:30 +0000 (UTC) From: Markus Armbruster Date: Fri, 21 Jul 2017 15:53:25 +0200 Message-Id: <1500645206-13559-9-git-send-email-armbru@redhat.com> In-Reply-To: <1500645206-13559-1-git-send-email-armbru@redhat.com> References: <1500645206-13559-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 8/9] tests/libqtest: Clean up how we read the QMP greeting List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org qtest_init() still uses the qtest_qmp_discard_response(s, "") hack to receive the greeting, even though we have qtest_qmp_receive() since commit 66e0c7b. 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 --- tests/libqtest.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 4a5492a..7e5425d 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -230,9 +230,11 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args) QTestState *qtest_init(const char *extra_args) { QTestState *s = qtest_init_without_qmp_handshake(extra_args); + QDict *greeting; /* Read the QMP greeting and then do the handshake */ - qtest_qmp_discard_response(s, ""); + greeting = qtest_qmp_receive(s); + QDECREF(greeting); qtest_qmp_discard_response(s, "{ 'execute': 'qmp_capabilities' }"); return s; -- 2.7.5