From nobody Wed Apr 16 08:19:20 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558369277; cv=none; d=zoho.com; s=zohoarc; b=FeRHYVupux3OeKwlqsHQel1RcoI7nDXghSGqIcN9LdNn9+z0pojLmuNLhN5qdqGFhCDyhGHRKcjNsdVMxka62gIUUTiUs7VaX1hph1FjTiOxD9pQ0A639XhG9pjlT4+Gz9oxJqYme4D+RmkYCecELmubkv4+fOCiZn/I6tfTnrQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558369277; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=b+mqWb8Q1RStKYGl6zrhfjP4NfBFuTiYc6CujVY27XA=; b=IJwPr5ZiOxcOS0q+hslIIFScQUwYf0UMC4AboE5ESDMija44lfdqZlpC06NwTrTXGcJvbwwJaBE58FY9bFaPtU54fawtDYsY7iYEV4FbFnGKArUIkLVuqp8kdwxrfeV0dOryppILxDH3dgRaQMF2TJYD9ECakBWcgGM2ezEHgkA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558369277830302.11887554899715; Mon, 20 May 2019 09:21:17 -0700 (PDT) Received: from localhost ([127.0.0.1]:38088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSl2B-0004Ch-QI for importer@patchew.org; Mon, 20 May 2019 12:21:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSkwq-0008EE-Jn for qemu-devel@nongnu.org; Mon, 20 May 2019 12:15:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hSkwp-0003Y8-LC for qemu-devel@nongnu.org; Mon, 20 May 2019 12:15:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34788) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hSkwm-0003LT-Jn; Mon, 20 May 2019 12:15:32 -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 ED5503092651; Mon, 20 May 2019 16:15:11 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-208.ams2.redhat.com [10.36.117.208]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E68A601A0; Mon, 20 May 2019 16:15:09 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 20 May 2019 18:14:34 +0200 Message-Id: <20190520161453.30723-6-kwolf@redhat.com> In-Reply-To: <20190520161453.30723-1-kwolf@redhat.com> References: <20190520161453.30723-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 20 May 2019 16:15:11 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 05/24] iotest: fix 169: do not run qmp_cont in RUN_STATE_FINISH_MIGRATE 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: kwolf@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy qmp_cont fails if vm in RUN_STATE_FINISH_MIGRATE, so let's wait for final RUN_STATE_POSTMIGRATE. Also, while being here, check qmp_cont result. Reported-by: Max Reitz Signed-off-by: Vladimir Sementsov-Ogievskiy Tested-by: Max Reitz Signed-off-by: Kevin Wolf --- tests/qemu-iotests/169 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/169 index 527aebd0cb..7e06cc1145 100755 --- a/tests/qemu-iotests/169 +++ b/tests/qemu-iotests/169 @@ -102,12 +102,17 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): event =3D self.vm_a.event_wait('MIGRATION') if event['data']['status'] =3D=3D 'completed': break + while True: + result =3D self.vm_a.qmp('query-status') + if (result['return']['status'] =3D=3D 'postmigrate'): + break =20 # test that bitmap is still here removed =3D (not migrate_bitmaps) and persistent self.check_bitmap(self.vm_a, False if removed else sha256) =20 - self.vm_a.qmp('cont') + result =3D self.vm_a.qmp('cont') + self.assert_qmp(result, 'return', {}) =20 # test that bitmap is still here after invalidation self.check_bitmap(self.vm_a, sha256) --=20 2.20.1