From nobody Wed Nov 5 13:11:01 2025 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.zohomail.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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534409348344420.38371363459805; Thu, 16 Aug 2018 01:49:08 -0700 (PDT) Received: from localhost ([::1]:54284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqDxr-000797-6W for importer@patchew.org; Thu, 16 Aug 2018 04:49:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqDmq-0001AL-H7 for qemu-devel@nongnu.org; Thu, 16 Aug 2018 04:37:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqDmf-0005NL-Ho for qemu-devel@nongnu.org; Thu, 16 Aug 2018 04:37:39 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51384 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqDmV-0005CV-67 for qemu-devel@nongnu.org; Thu, 16 Aug 2018 04:37:25 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A010D4028152 for ; Thu, 16 Aug 2018 08:37:05 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56AED100F350; Thu, 16 Aug 2018 08:37:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1489711386AB; Thu, 16 Aug 2018 10:37:02 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 16 Aug 2018 10:36:51 +0200 Message-Id: <20180816083701.3932-16-armbru@redhat.com> In-Reply-To: <20180816083701.3932-1-armbru@redhat.com> References: <20180816083701.3932-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 16 Aug 2018 08:37:05 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 16 Aug 2018 08:37:05 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 15/25] migration-test: Make wait_command() return the "return" member 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: "Dr . David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" All callers of wait_command() are only interested in the success response's "return" member. Lift its extraction into wait_command(). Cc: Juan Quintela Cc: Dr. David Alan Gilbert Signed-off-by: Markus Armbruster Reviewed-by: Juan Quintela Reviewed-by: Eric Blake Message-Id: <20180806065344.7103-16-armbru@redhat.com> --- tests/migration-test.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index 486059580c..db652e30a0 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -155,7 +155,7 @@ static void wait_for_serial(const char *side) static QDict *wait_command(QTestState *who, const char *command) { const char *event_string; - QDict *response; + QDict *response, *ret; =20 response =3D qtest_qmp(who, command); =20 @@ -168,7 +168,12 @@ static QDict *wait_command(QTestState *who, const char= *command) qobject_unref(response); response =3D qtest_qmp_receive(who); } - return response; + + ret =3D qdict_get_qdict(response, "return"); + g_assert(ret); + qobject_ref(ret); + qobject_unref(response); + return ret; } =20 /* @@ -177,15 +182,7 @@ static QDict *wait_command(QTestState *who, const char= *command) */ static QDict *migrate_query(QTestState *who) { - QDict *rsp, *rsp_return; - - rsp =3D wait_command(who, "{ 'execute': 'query-migrate' }"); - rsp_return =3D qdict_get_qdict(rsp, "return"); - g_assert(rsp_return); - qobject_ref(rsp_return); - qobject_unref(rsp); - - return rsp_return; + return wait_command(who, "{ 'execute': 'query-migrate' }"); } =20 /* @@ -327,16 +324,16 @@ static void cleanup(const char *filename) static void migrate_check_parameter(QTestState *who, const char *parameter, const char *value) { - QDict *rsp, *rsp_return; + QDict *rsp_return; char *result; =20 - rsp =3D wait_command(who, "{ 'execute': 'query-migrate-parameters' }"); - rsp_return =3D qdict_get_qdict(rsp, "return"); + rsp_return =3D wait_command(who, + "{ 'execute': 'query-migrate-parameters' }"); result =3D g_strdup_printf("%" PRId64, qdict_get_try_int(rsp_return, parameter, -1)= ); g_assert_cmpstr(result, =3D=3D, value); g_free(result); - qobject_unref(rsp); + qobject_unref(rsp_return); } =20 static void migrate_set_parameter(QTestState *who, const char *parameter, @@ -360,7 +357,6 @@ static void migrate_pause(QTestState *who) QDict *rsp; =20 rsp =3D wait_command(who, "{ 'execute': 'migrate-pause' }"); - g_assert(qdict_haskey(rsp, "return")); qobject_unref(rsp); } =20 @@ -373,7 +369,6 @@ static void migrate_recover(QTestState *who, const char= *uri) " 'arguments': { 'uri': '%s' } }", uri); =20 rsp =3D wait_command(who, cmd); - g_assert(qdict_haskey(rsp, "return")); g_free(cmd); qobject_unref(rsp); } @@ -414,7 +409,6 @@ static void migrate_postcopy_start(QTestState *from, QT= estState *to) QDict *rsp; =20 rsp =3D wait_command(from, "{ 'execute': 'migrate-start-postcopy' }"); - g_assert(qdict_haskey(rsp, "return")); qobject_unref(rsp); =20 if (!got_stop) { @@ -692,7 +686,7 @@ static void test_postcopy_recovery(void) static void test_baddest(void) { QTestState *from, *to; - QDict *rsp, *rsp_return; + QDict *rsp_return; char *status; bool failed; =20 @@ -708,12 +702,10 @@ static void test_baddest(void) } while (!failed); =20 /* Is the machine currently running? */ - rsp =3D wait_command(from, "{ 'execute': 'query-status' }"); - g_assert(qdict_haskey(rsp, "return")); - rsp_return =3D qdict_get_qdict(rsp, "return"); + rsp_return =3D wait_command(from, "{ 'execute': 'query-status' }"); g_assert(qdict_haskey(rsp_return, "running")); g_assert(qdict_get_bool(rsp_return, "running")); - qobject_unref(rsp); + qobject_unref(rsp_return); =20 test_migrate_end(from, to, false); } --=20 2.17.1