From nobody Tue Feb 10 10:04:16 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.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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511403243619526.211722511633; Wed, 22 Nov 2017 18:14:03 -0800 (PST) Received: from localhost ([::1]:42135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHh1Z-0000AL-M3 for importer@patchew.org; Wed, 22 Nov 2017 21:13:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHgxP-00059l-Cy for qemu-devel@nongnu.org; Wed, 22 Nov 2017 21:09:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eHgxJ-0001ih-8B for qemu-devel@nongnu.org; Wed, 22 Nov 2017 21:09:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50592) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eHgxG-0001gj-G3; Wed, 22 Nov 2017 21:09:30 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B1E5CC047B66; Thu, 23 Nov 2017 02:09:29 +0000 (UTC) Received: from localhost (ovpn-204-18.brq.redhat.com [10.40.204.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8909C61982; Thu, 23 Nov 2017 02:09:25 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Thu, 23 Nov 2017 03:08:24 +0100 Message-Id: <20171123020832.8165-10-mreitz@redhat.com> In-Reply-To: <20171123020832.8165-1-mreitz@redhat.com> References: <20171123020832.8165-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 23 Nov 2017 02:09:29 +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 09/17] iotests: Disable some tests for compat=0.10 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 , Fam Zheng , John Snow , qemu-devel@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" Tests 080, 130, 137, and 176 simply do not work with compat=3D0.10 for the reasons stated there. 177 is a bit more interesting: Originally, it was actually very much intended to work with compat=3D0.10 (it even had a special case for that). However, it now prints the test image's map twice, and short of just not doing that, there is no solution I can imagine that is both simple and would leave compat=3D0.10 support intact. Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/080 | 5 +++-- tests/qemu-iotests/130 | 2 ++ tests/qemu-iotests/137 | 2 ++ tests/qemu-iotests/176 | 2 ++ tests/qemu-iotests/177 | 13 +++---------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 index 55044c700b..1c2bd85742 100755 --- a/tests/qemu-iotests/080 +++ b/tests/qemu-iotests/080 @@ -41,8 +41,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file _supported_os Linux -# Internal snapshots are (currently) impossible with refcount_bits=3D1 -_unsupported_imgopts 'refcount_bits=3D1[^0-9]' +# - Internal snapshots are (currently) impossible with refcount_bits=3D1 +# - This is generally a test for compat=3D1.1 images +_unsupported_imgopts 'refcount_bits=3D1[^0-9]' 'compat=3D0.10' =20 header_size=3D104 =20 diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 index e7e43de6d6..2c4b94da1b 100755 --- a/tests/qemu-iotests/130 +++ b/tests/qemu-iotests/130 @@ -45,6 +45,8 @@ _supported_fmt qcow2 _supported_proto generic _unsupported_proto vxhs _supported_os Linux +# We are going to use lazy-refcounts +_unsupported_imgopts 'compat=3D0.10' =20 qemu_comm_method=3D"monitor" =20 diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 index eb91e517d7..5a01250005 100755 --- a/tests/qemu-iotests/137 +++ b/tests/qemu-iotests/137 @@ -41,6 +41,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file _supported_os Linux +# We are going to use lazy-refcounts +_unsupported_imgopts 'compat=3D0.10' =20 =20 _make_test_img 64M diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176 index b8dc17c592..d38b3aeb91 100755 --- a/tests/qemu-iotests/176 +++ b/tests/qemu-iotests/176 @@ -48,6 +48,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file _supported_os Linux +# Persistent dirty bitmaps require compat=3D1.1 +_unsupported_imgopts 'compat=3D0.10' =20 function run_qemu() { diff --git a/tests/qemu-iotests/177 b/tests/qemu-iotests/177 index 28990977f1..86cf25f855 100755 --- a/tests/qemu-iotests/177 +++ b/tests/qemu-iotests/177 @@ -39,6 +39,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt qcow2 _supported_proto file +# This test assumes that discard leaves zero clusters +_unsupported_imgopts 'compat=3D0.10' =20 CLUSTER_SIZE=3D1M size=3D128M @@ -93,15 +95,6 @@ echo "=3D=3D verify image content =3D=3D" =20 function verify_io() { - if ($QEMU_IMG info -f "$IMGFMT" "$TEST_IMG" | - grep "compat: 0.10" > /dev/null); then - # For v2 images, discarded clusters are read from the backing file - discarded=3D11 - else - # Discarded clusters are zeroed for v3 or later - discarded=3D0 - fi - echo read -P 22 0 1000 echo read -P 33 1000 128k echo read -P 22 132072 7871512 @@ -109,7 +102,7 @@ function verify_io() echo read -P 22 10096640 23457792 echo read -P 0 32M 32M echo read -P 22 64M 13M - echo read -P $discarded 77M 29M + echo read -P 0 77M 29M echo read -P 22 106M 4M echo read -P 11 110M 18M } --=20 2.13.6