From nobody Mon Feb 9 20:10:46 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 1492747250070161.1716960504939; Thu, 20 Apr 2017 21:00:50 -0700 (PDT) Received: from localhost ([::1]:56988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PkW-0000y2-Go for importer@patchew.org; Fri, 21 Apr 2017 00:00:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1PgT-0005sU-JW for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1PgS-0003nd-Jq for qemu-devel@nongnu.org; Thu, 20 Apr 2017 23:56:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42136) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1PgP-0003l9-Q9; Thu, 20 Apr 2017 23:56:34 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A7D108E231; Fri, 21 Apr 2017 03:56:32 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-35.pek2.redhat.com [10.72.8.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 076A017966; Fri, 21 Apr 2017 03:56:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A7D108E231 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=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A7D108E231 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 21 Apr 2017 11:55:53 +0800 Message-Id: <20170421035606.448-8-famz@redhat.com> In-Reply-To: <20170421035606.448-1-famz@redhat.com> References: <20170421035606.448-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 21 Apr 2017 03:56:32 +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 v14 07/20] iotests: 030: Prepare for image locking 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: Kevin Wolf , qemu-block@nongnu.org, Max Reitz 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" qemu-img and qemu-io commands when guest is running need "-U" option, add it. Signed-off-by: Fam Zheng --- tests/qemu-iotests/030 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 0d472d5..5f1dce8 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -63,8 +63,8 @@ class TestSingleDrive(iotests.QMPTestCase): def test_stream_intermediate(self): self.assert_no_active_block_jobs() =20 - self.assertNotEqual(qemu_io('-f', 'raw', '-c', 'map', backing_img), - qemu_io('-f', iotests.imgfmt, '-c', 'map', mid= _img), + self.assertNotEqual(qemu_io('-f', 'raw', '-rU', '-c', 'map', backi= ng_img), + qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'ma= p', mid_img), 'image file map matches backing file before st= reaming') =20 result =3D self.vm.qmp('block-stream', device=3D'mid', job_id=3D's= tream-mid') @@ -114,7 +114,7 @@ class TestSingleDrive(iotests.QMPTestCase): self.assert_no_active_block_jobs() =20 # The image map is empty before the operation - empty_map =3D qemu_io('-f', iotests.imgfmt, '-c', 'map', test_img) + empty_map =3D qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map', te= st_img) =20 # This is a no-op: no data should ever be copied from the base ima= ge result =3D self.vm.qmp('block-stream', device=3D'drive0', base=3Dm= id_img) @@ -125,7 +125,7 @@ class TestSingleDrive(iotests.QMPTestCase): self.assert_no_active_block_jobs() self.vm.shutdown() =20 - self.assertEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', test_i= mg), + self.assertEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', '-r', = test_img), empty_map, 'image file map changed after a no-op') =20 def test_stream_partial(self): @@ -197,8 +197,8 @@ class TestParallelOps(iotests.QMPTestCase): =20 # Check that the maps don't match before the streaming operations for i in range(2, self.num_imgs, 2): - self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map',= self.imgs[i]), - qemu_io('-f', iotests.imgfmt, '-c', 'map',= self.imgs[i-1]), + self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-U', '-c', = 'map', self.imgs[i]), + qemu_io('-f', iotests.imgfmt, '-U', '-c', = 'map', self.imgs[i-1]), 'image file map matches backing file befor= e streaming') =20 # Create all streaming jobs @@ -351,8 +351,8 @@ class TestParallelOps(iotests.QMPTestCase): def test_stream_base_node_name(self): self.assert_no_active_block_jobs() =20 - self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', sel= f.imgs[4]), - qemu_io('-f', iotests.imgfmt, '-c', 'map', sel= f.imgs[3]), + self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-U', '-c', 'map= ', self.imgs[4]), + qemu_io('-f', iotests.imgfmt, '-U', '-c', 'map= ', self.imgs[3]), 'image file map matches backing file before st= reaming') =20 # Error: the base node does not exist @@ -422,8 +422,8 @@ class TestQuorum(iotests.QMPTestCase): if not iotests.supports_quorum(): return =20 - self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', sel= f.children[0]), - qemu_io('-f', iotests.imgfmt, '-c', 'map', sel= f.backing[0]), + self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-U', '-c', 'map= ', self.children[0]), + qemu_io('-f', iotests.imgfmt, '-U', '-c', 'map= ', self.backing[0]), 'image file map matches backing file before st= reaming') =20 self.assert_no_active_block_jobs() @@ -436,8 +436,8 @@ class TestQuorum(iotests.QMPTestCase): self.assert_no_active_block_jobs() self.vm.shutdown() =20 - self.assertEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', self.c= hildren[0]), - qemu_io('-f', iotests.imgfmt, '-c', 'map', self.b= acking[0]), + self.assertEqual(qemu_io('-f', iotests.imgfmt, '-U', '-c', 'map', = self.children[0]), + qemu_io('-f', iotests.imgfmt, '-U', '-c', 'map', = self.backing[0]), 'image file map does not match backing file after= streaming') =20 class TestSmallerBackingFile(iotests.QMPTestCase): --=20 2.9.3