From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cv7M4-0002ah-58 for qemu-devel@nongnu.org; Mon, 03 Apr 2017 15:09:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cv7Lz-0000NF-6H for qemu-devel@nongnu.org; Mon, 03 Apr 2017 15:09:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38086) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cv7Ly-0000Mw-Vg for qemu-devel@nongnu.org; Mon, 03 Apr 2017 15:09:27 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E5D3315F571 for ; Mon, 3 Apr 2017 19:09:25 +0000 (UTC) References: <1490860207-8302-1-git-send-email-thuth@redhat.com> <1490860207-8302-2-git-send-email-thuth@redhat.com> From: John Snow Message-ID: Date: Mon, 3 Apr 2017 15:09:24 -0400 MIME-Version: 1.0 In-Reply-To: <1490860207-8302-2-git-send-email-thuth@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/3] libqtest: Ignore QMP events when parsing the response for HMP commands List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth , "Dr. David Alan Gilbert" , qemu-devel@nongnu.org Cc: Markus Armbruster On 03/30/2017 03:50 AM, Thomas Huth wrote: > When running certain HMP commands (like "device_del") via QMP, we > can sometimes get a QMP event in the response first, so that the > "g_assert(ret)" statement in qtest_hmp() triggers and the test > fails. Fix this by ignoring such QMP events while looking for the > real return value from QMP. > > Signed-off-by: Thomas Huth > --- > tests/libqtest.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/tests/libqtest.c b/tests/libqtest.c > index a5c3d2b..c9b2d76 100644 > --- a/tests/libqtest.c > +++ b/tests/libqtest.c > @@ -580,6 +580,12 @@ char *qtest_hmpv(QTestState *s, const char *fmt, va_list ap) > " 'arguments': {'command-line': %s}}", > cmd); > ret = g_strdup(qdict_get_try_str(resp, "return")); > + while (ret == NULL && qdict_get_try_str(resp, "event")) { > + /* Ignore asynchronous QMP events */ > + QDECREF(resp); > + resp = qtest_qmp_receive(s); > + ret = g_strdup(qdict_get_try_str(resp, "return")); > + } > g_assert(ret); > QDECREF(resp); > g_free(cmd); > You've probably been asked this, but can you just shove the QMP response you don't want into the event queue for consumption by other calls? --js