From nobody Mon Feb 9 08:55:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490092853352290.59557291522106; Tue, 21 Mar 2017 03:40:53 -0700 (PDT) Received: from localhost ([::1]:38624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqHDf-0002LY-9K for importer@patchew.org; Tue, 21 Mar 2017 06:40:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqHCr-0002L9-Up for qemu-devel@nongnu.org; Tue, 21 Mar 2017 06:40:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqHCp-0008HM-6i for qemu-devel@nongnu.org; Tue, 21 Mar 2017 06:40:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45540) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqHCp-0008Go-0h for qemu-devel@nongnu.org; Tue, 21 Mar 2017 06:39:59 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03D9864A4E for ; Tue, 21 Mar 2017 10:39:59 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-108.ams2.redhat.com [10.36.116.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CE03176CB; Tue, 21 Mar 2017 10:39:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 03D9864A4E Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=thuth@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 03D9864A4E From: Thomas Huth To: "Dr. David Alan Gilbert" , qemu-devel@nongnu.org Date: Tue, 21 Mar 2017 11:39:50 +0100 Message-Id: <1490092792-30957-2-git-send-email-thuth@redhat.com> In-Reply-To: <1490092792-30957-1-git-send-email-thuth@redhat.com> References: <1490092792-30957-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 21 Mar 2017 10:39:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] libqtest: Ignore QMP events when parsing the response for HMP commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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. So ignore such QMP events when looking for the real return value from QMP. Signed-off-by: Thomas Huth Reviewed-by: Stefan Hajnoczi --- 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_li= st ap) " 'arguments': {'command-line': %s}}", cmd); ret =3D g_strdup(qdict_get_try_str(resp, "return")); + while (ret =3D=3D NULL && qdict_get_try_str(resp, "event")) { + /* Ignore asynchronous QMP events */ + QDECREF(resp); + resp =3D qtest_qmp_receive(s); + ret =3D g_strdup(qdict_get_try_str(resp, "return")); + } g_assert(ret); QDECREF(resp); g_free(cmd); --=20 1.8.3.1