From nobody Tue May 6 16:27:45 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=1566930810; cv=none;
d=zoho.com; s=zohoarc;
b=XqIe0E2rtbWclm86ySJREfLiQ7orfAO0mUKDd2gxDeIEiwg0ocfsNGJ/3SEuPRi5ZJtO+KXn5n/JrwOW+eRxWAcMomRp2uA5HKgtL0whpJY5ESD8IIYJOkkvo9RtltLUnf34c77vo+ZgxhkZF9tmV+wcHorrOAJVCXQASkXkPGI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
s=zohoarc;
t=1566930810;
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=OVpurlN6end7xMWxGhsyA6OQagACNB+jl3ifuLz4PuI=;
b=cBxUffK9b+5wT3Ordm8HMSy/NjEJkySMctxdK5U5vebBdTAEsUWX/sUuT+PGLfvYBcZ9Vodo5rhce7eCu05XuDhVUS6rhR+C0e2lPdJvCvfflQQSFT0lVEmhIUTbjcByLNiLRQcbn2nunLo3DjJV885kSikkWGmn7OBqkggFt+0=
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=<mreitz@redhat.com> (p=none dis=none)
header.from=<mreitz@redhat.com>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 156693081015490.70157032822681;
Tue, 27 Aug 2019 11:33:30 -0700 (PDT)
Received: from localhost ([::1]:55570 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1i2gHV-0001u1-6s
for importer@patchew.org; Tue, 27 Aug 2019 14:33:25 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53231)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <mreitz@redhat.com>) id 1i2g7x-0002mP-Ht
for qemu-devel@nongnu.org; Tue, 27 Aug 2019 14:23:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <mreitz@redhat.com>) id 1i2g7v-0005PZ-SR
for qemu-devel@nongnu.org; Tue, 27 Aug 2019 14:23:33 -0400
Received: from mx1.redhat.com ([209.132.183.28]:50928)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <mreitz@redhat.com>)
id 1i2g7s-0005Mj-Jo; Tue, 27 Aug 2019 14:23:28 -0400
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 ED5653D962;
Tue, 27 Aug 2019 18:23:27 +0000 (UTC)
Received: from localhost (unknown [10.40.205.2])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 83C6D60C05;
Tue, 27 Aug 2019 18:23:27 +0000 (UTC)
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Date: Tue, 27 Aug 2019 20:23:03 +0200
Message-Id: <20190827182313.25983-6-mreitz@redhat.com>
In-Reply-To: <20190827182313.25983-1-mreitz@redhat.com>
References: <20190827182313.25983-1-mreitz@redhat.com>
MIME-Version: 1.0
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.30]); Tue, 27 Aug 2019 18:23:28 +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/15] iotests: Fix _filter_img_create()
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org,
Max Reitz <mreitz@redhat.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Content-Type: text/plain; charset="utf-8"
fe646693acc changed qemu-img create's output so that it no longer prints
single quotes around parameter values. The subformat and adapter_type
filters in _filter_img_create() have never been adapted to that change.
Fixes: fe646693acc13ac48b98435d14149ab04dc597bc
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20190815153638.4600-2-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/059.out | 16 ++++++++--------
tests/qemu-iotests/common.filter | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
index fe3f861f3c..b2e718d29f 100644
--- a/tests/qemu-iotests/059.out
+++ b/tests/qemu-iotests/059.out
@@ -13,17 +13,17 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D671=
08864
qemu-io: can't open device TEST_DIR/t.vmdk: L1 size too big
=20
=3D=3D=3D Testing monolithicFlat creation and opening =3D=3D=3D
-Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D2147483648 subformat=
=3DmonolithicFlat
+Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D2147483648
image: TEST_DIR/t.IMGFMT
file format: IMGFMT
virtual size: 2 GiB (2147483648 bytes)
=20
=3D=3D=3D Testing monolithicFlat with zeroed_grain =3D=3D=3D
qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
-Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D2147483648 subformat=
=3DmonolithicFlat
+Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D2147483648
=20
=3D=3D=3D Testing big twoGbMaxExtentFlat =3D=3D=3D
-Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824000 subforma=
t=3DtwoGbMaxExtentFlat
+Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824000
image: TEST_DIR/t.vmdk
file format: vmdk
virtual size: 0.977 TiB (1073741824000 bytes)
@@ -2038,7 +2038,7 @@ Format specific information:
qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Invalid extent line: RW 1258=
2912 VMFS "dummy.IMGFMT" 1
=20
=3D=3D=3D Testing truncated sparse =3D=3D=3D
-Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D107374182400 subformat=
=3DmonolithicSparse
+Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D107374182400
qemu-img: Could not open 'TEST_DIR/t.IMGFMT': File truncated, expecting at=
least 13172736 bytes
=20
=3D=3D=3D Converting to streamOptimized from image with small cluster size=
=3D=3D=3D
@@ -2049,7 +2049,7 @@ wrote 512/512 bytes at offset 10240
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
=20
=3D=3D=3D Testing monolithicFlat with internally generated JSON file name =
=3D=3D=3D
-Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 subformat=3Dm=
onolithicFlat
+Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864
qemu-io: can't open: Cannot use relative extent paths with VMDK descriptor=
file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, =
"driver": "blkdebug", "inject-error.0.event": "read_aio"}'
=20
=3D=3D=3D Testing version 3 =3D=3D=3D
@@ -2259,7 +2259,7 @@ read 512/512 bytes at offset 64931328
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
=20
=3D=3D=3D Testing 4TB monolithicFlat creation and IO =3D=3D=3D
-Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D4398046511104 subforma=
t=3DmonolithicFlat
+Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D4398046511104
image: TEST_DIR/t.IMGFMT
file format: IMGFMT
virtual size: 4 TiB (4398046511104 bytes)
@@ -2333,7 +2333,7 @@ read 1024/1024 bytes at offset 966367641600
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
=20
=3D=3D=3D Testing qemu-img map on extents =3D=3D=3D
-Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D33285996544 subformat=
=3DmonolithicSparse
+Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D33285996544
wrote 1024/1024 bytes at offset 65024
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
wrote 1024/1024 bytes at offset 2147483136
@@ -2344,7 +2344,7 @@ Offset Length Mapped to File
0 0x20000 0x3f0000 TEST_DIR/t.vmdk
0x7fff0000 0x20000 0x410000 TEST_DIR/t.vmdk
0x140000000 0x10000 0x430000 TEST_DIR/t.vmdk
-Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D33285996544 subformat=
=3DtwoGbMaxExtentSparse
+Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D33285996544
wrote 1024/1024 bytes at offset 65024
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
wrote 1024/1024 bytes at offset 2147483136
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.f=
ilter
index 8e9235d6fe..445a1c23e0 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -130,8 +130,8 @@ _filter_img_create()
-e "s# compat6=3D\\(on\\|off\\)##g" \
-e "s# static=3D\\(on\\|off\\)##g" \
-e "s# zeroed_grain=3D\\(on\\|off\\)##g" \
- -e "s# subformat=3D'[^']*'##g" \
- -e "s# adapter_type=3D'[^']*'##g" \
+ -e "s# subformat=3D[^ ]*##g" \
+ -e "s# adapter_type=3D[^ ]*##g" \
-e "s# hwversion=3D[^ ]*##g" \
-e "s# lazy_refcounts=3D\\(on\\|off\\)##g" \
-e "s# block_size=3D[0-9]\\+##g" \
--=20
2.21.0