From nobody Sat Feb 7 03:55:55 2026 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=1565883542; cv=none; d=zoho.com; s=zohoarc; b=PH9fXSHLQsGUEqICGj3sNUwoAI+AThOOjBafYEAsk1IcLPdVpn40WswuWxdaF0hisd/KxvEW9da0tTyXnnW755LQrRbmQKXvnKEsvaUE+Cy4RLwtY5Ad7gbvCfWAbSdyWD/SDyevqAUoYa/dwqN6YWhSEk9oPgah+HH9nj1OnVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565883542; 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=ysDKcCtdtoTnLslv6r1HaZjiWN4qN9MC0j990VDMFnM=; b=ejStuAjeXKqqWrSloBsJ7GST9xxvtRnQY7JO1fHOJt4d8IfNmPISLJ1EgaVlLubBqffcuTtiY22qWQRAQv21vRFSqGGfTURsIEIvkqBT0xTHcZDqxv6ozKYbaENVj+hJdAoObv8YRHXi7JjePcTDh7tMCcvmKGDRbN8LyiadkKA= 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 1565883542317419.5800206212547; Thu, 15 Aug 2019 08:39:02 -0700 (PDT) Received: from localhost ([::1]:43228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHq7-0006qS-7g for importer@patchew.org; Thu, 15 Aug 2019 11:38:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38790) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHoJ-0004zL-6X for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyHoD-0000Q0-9K for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56650) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyHo3-0000MP-1v; Thu, 15 Aug 2019 11:36:51 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5FAF4C057EC6; Thu, 15 Aug 2019 15:36:50 +0000 (UTC) Received: from localhost (ovpn-204-81.brq.redhat.com [10.40.204.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EFE245C22F; Thu, 15 Aug 2019 15:36:44 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Thu, 15 Aug 2019 17:36:32 +0200 Message-Id: <20190815153638.4600-2-mreitz@redhat.com> In-Reply-To: <20190815153638.4600-1-mreitz@redhat.com> References: <20190815153638.4600-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 15 Aug 2019 15:36:50 +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] [PATCH v2 1/7] iotests: Fix _filter_img_create() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: John Snow --- 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 4fab42a28c..77d8984428 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 35fddc746f..64dd9200f3 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 From nobody Sat Feb 7 03:55:55 2026 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=1565883683; cv=none; d=zoho.com; s=zohoarc; b=jWDLF6M9MiDiTzeShf9BqApr7lDtUQeHJa+pFzxYwLWPiTIALhZQVsPc4QcJfdR3dujiXTGoK+i1W6f4Thz7OEzvcR+LEkRzevrdlBJMWf57lbkh6R5SD7S0SRXXyx2QsoM5V0jYkSqewtYV5yTrz59cPKetWMllT64D+y9BxmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565883683; 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=nBUIZR8gb+Ct3oD5DOjG3VP/JCh1Sj1yIN92KcUo8Tk=; b=n5VwgYJGtW8YyX4mgGViPwIrMNT7QDzV9PRoN4Dh8JIEmZGC0Uncchj30+GXKhQ8xgx8c8kSgkGu3zChwV5F7YsFS3eL7CyxfswhYBysEo4P81SzfRB57mTLSveo86igcaNp6QOsb4rfzVKZ2xBvFrkTWN0JUFhaw1zAsh4rUns= 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 1565883683429561.0244153581743; Thu, 15 Aug 2019 08:41:23 -0700 (PDT) Received: from localhost ([::1]:43270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHsQ-0001gu-42 for importer@patchew.org; Thu, 15 Aug 2019 11:41:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38786) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHoI-0004yF-Jz for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyHoE-0000QV-D5 for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48152) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyHo5-0000N0-CH; Thu, 15 Aug 2019 11:36:53 -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 AC32019CF89; Thu, 15 Aug 2019 15:36:52 +0000 (UTC) Received: from localhost (ovpn-204-81.brq.redhat.com [10.40.204.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4110469CAC; Thu, 15 Aug 2019 15:36:52 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Thu, 15 Aug 2019 17:36:33 +0200 Message-Id: <20190815153638.4600-3-mreitz@redhat.com> In-Reply-To: <20190815153638.4600-1-mreitz@redhat.com> References: <20190815153638.4600-1-mreitz@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.29]); Thu, 15 Aug 2019 15:36:52 +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] [PATCH v2 2/7] vmdk: Use bdrv_dirname() for relative extent paths X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This makes iotest 033 pass with e.g. subformat=3DmonolithicFlat. It also turns a former error in 059 into success. Signed-off-by: Max Reitz Reviewed-by: John Snow --- block/vmdk.c | 54 ++++++++++++++++++++++++-------------- tests/qemu-iotests/059 | 7 +++-- tests/qemu-iotests/059.out | 4 ++- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index bd36ece125..825222de55 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1076,8 +1076,7 @@ static const char *next_line(const char *s) } =20 static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, - const char *desc_file_path, QDict *options, - Error **errp) + QDict *options, Error **errp) { int ret; int matches; @@ -1087,6 +1086,7 @@ static int vmdk_parse_extents(const char *desc, Block= DriverState *bs, const char *p, *np; int64_t sectors =3D 0; int64_t flat_offset; + char *desc_file_dir =3D NULL; char *extent_path; BdrvChild *extent_file; BDRVVmdkState *s =3D bs->opaque; @@ -1130,16 +1130,23 @@ static int vmdk_parse_extents(const char *desc, Blo= ckDriverState *bs, continue; } =20 - if (!path_is_absolute(fname) && !path_has_protocol(fname) && - !desc_file_path[0]) - { - bdrv_refresh_filename(bs->file->bs); - error_setg(errp, "Cannot use relative extent paths with VMDK " - "descriptor file '%s'", bs->file->bs->filename); - return -EINVAL; - } + if (path_is_absolute(fname)) { + extent_path =3D g_strdup(fname); + } else { + if (!desc_file_dir) { + desc_file_dir =3D bdrv_dirname(bs->file->bs, errp); + if (!desc_file_dir) { + bdrv_refresh_filename(bs->file->bs); + error_prepend(errp, "Cannot use relative paths with VM= DK " + "descriptor file '%s': ", + bs->file->bs->filename); + ret =3D -EINVAL; + goto out; + } + } =20 - extent_path =3D path_combine(desc_file_path, fname); + extent_path =3D g_strconcat(desc_file_dir, fname, NULL); + } =20 ret =3D snprintf(extent_opt_prefix, 32, "extents.%d", s->num_exten= ts); assert(ret < 32); @@ -1149,7 +1156,8 @@ static int vmdk_parse_extents(const char *desc, Block= DriverState *bs, g_free(extent_path); if (local_err) { error_propagate(errp, local_err); - return -EINVAL; + ret =3D -EINVAL; + goto out; } =20 /* save to extents array */ @@ -1160,7 +1168,7 @@ static int vmdk_parse_extents(const char *desc, Block= DriverState *bs, 0, 0, 0, 0, 0, &extent, errp); if (ret < 0) { bdrv_unref_child(bs, extent_file); - return ret; + goto out; } extent->flat_start_offset =3D flat_offset << 9; } else if (!strcmp(type, "SPARSE") || !strcmp(type, "VMFSSPARSE"))= { @@ -1175,24 +1183,27 @@ static int vmdk_parse_extents(const char *desc, Blo= ckDriverState *bs, g_free(buf); if (ret) { bdrv_unref_child(bs, extent_file); - return ret; + goto out; } extent =3D &s->extents[s->num_extents - 1]; } else if (!strcmp(type, "SESPARSE")) { ret =3D vmdk_open_se_sparse(bs, extent_file, bs->open_flags, e= rrp); if (ret) { bdrv_unref_child(bs, extent_file); - return ret; + goto out; } extent =3D &s->extents[s->num_extents - 1]; } else { error_setg(errp, "Unsupported extent type '%s'", type); bdrv_unref_child(bs, extent_file); - return -ENOTSUP; + ret =3D -ENOTSUP; + goto out; } extent->type =3D g_strdup(type); } - return 0; + + ret =3D 0; + goto out; =20 invalid: np =3D next_line(p); @@ -1201,7 +1212,11 @@ invalid: np--; } error_setg(errp, "Invalid extent line: %.*s", (int)(np - p), p); - return -EINVAL; + ret =3D -EINVAL; + +out: + g_free(desc_file_dir); + return ret; } =20 static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf, @@ -1228,8 +1243,7 @@ static int vmdk_open_desc_file(BlockDriverState *bs, = int flags, char *buf, } s->create_type =3D g_strdup(ct); s->desc_offset =3D 0; - ret =3D vmdk_parse_extents(buf, bs, bs->file->bs->exact_filename, opti= ons, - errp); + ret =3D vmdk_parse_extents(buf, bs, options, errp); exit: return ret; } diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index 279aee6815..fbed5f9483 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -114,9 +114,12 @@ $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=3Dstre= amOptimized "$TEST_IMG.qcow2 =20 echo echo "=3D=3D=3D Testing monolithicFlat with internally generated JSON file= name =3D=3D=3D" +# Should work, because bdrv_dirname() works fine with blkdebug IMGOPTS=3D"subformat=3DmonolithicFlat" _make_test_img 64M -$QEMU_IO -c "open -o driver=3D$IMGFMT,file.driver=3Dblkdebug,file.image.fi= lename=3D$TEST_IMG,file.inject-error.0.event=3Dread_aio" 2>&1 \ - | _filter_testdir | _filter_imgfmt +$QEMU_IO -c "open -o driver=3D$IMGFMT,file.driver=3Dblkdebug,file.image.fi= lename=3D$TEST_IMG,file.inject-error.0.event=3Dread_aio" \ + -c info \ + 2>&1 \ + | _filter_testdir | _filter_imgfmt | _filter_img_info _cleanup_test_img =20 echo diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 77d8984428..120cddd207 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -2050,7 +2050,9 @@ wrote 512/512 bytes at offset 10240 =20 =3D=3D=3D Testing monolithicFlat with internally generated JSON file name = =3D=3D=3D 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"}' +format name: IMGFMT +cluster size: 0 bytes +vm state offset: 0 bytes =20 =3D=3D=3D Testing version 3 =3D=3D=3D image: TEST_DIR/iotest-version3.IMGFMT --=20 2.21.0 From nobody Sat Feb 7 03:55:55 2026 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=1565883567; cv=none; d=zoho.com; s=zohoarc; b=Tu3lvyeRJ2m8WA4+O6ul+F+iBWkx5R7qBYsE9ejjff42WBmZ626qwpSkGOrBA8RtovdC1igQs5TeJx+mrsLxKd98bCaOOhoQx5boWdTUqrvMF3oI6DkF+x3ICNEwumEeWgHq2SKmRA6v3n2gcBXqBkubRAnZ6L5KMqRqzqkdf3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565883567; 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=EgHviY+tr1L1aKJgz5RcZwVvIHSgG+KwHi4v6/7yz50=; b=hxuGUg8TYbBDQZ1HVi2qsuTizAaBWY/WKoKhrFyzpz0d2zjc+lWpkudaMqG6F5BXdBuG69AFBloZZy+ErxDsjtqm2DyRqqjjKwOyt0Ud1TfTt1LTaMnFRmBE2S22Bof7/kleoFDjPeshIFVWJtdeMD2EGf2SmBMESMGDed4v35g= 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 1565883567242905.2766927115913; Thu, 15 Aug 2019 08:39:27 -0700 (PDT) Received: from localhost ([::1]:43232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHqX-0007JP-QD for importer@patchew.org; Thu, 15 Aug 2019 11:39:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38816) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHoL-00053H-Pm for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyHoG-0000RO-RW for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56682) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyHo7-0000Np-Lg; Thu, 15 Aug 2019 11:36:55 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 06ED6C058CBD; Thu, 15 Aug 2019 15:36:55 +0000 (UTC) Received: from localhost (ovpn-204-81.brq.redhat.com [10.40.204.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8DDDE100194E; Thu, 15 Aug 2019 15:36:54 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Thu, 15 Aug 2019 17:36:34 +0200 Message-Id: <20190815153638.4600-4-mreitz@redhat.com> In-Reply-To: <20190815153638.4600-1-mreitz@redhat.com> References: <20190815153638.4600-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 15 Aug 2019 15:36:55 +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] [PATCH v2 3/7] iotests: Keep testing broken relative extent paths X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We had a test for a case where relative extent paths did not work, but unfortunately we just fixed the underlying problem, so it works now. This patch adds a new test case that still fails. Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/059 | 27 +++++++++++++++++++++++++++ tests/qemu-iotests/059.out | 4 ++++ 2 files changed, 31 insertions(+) diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index fbed5f9483..10bfbaecec 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -114,6 +114,8 @@ $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=3Dstrea= mOptimized "$TEST_IMG.qcow2 =20 echo echo "=3D=3D=3D Testing monolithicFlat with internally generated JSON file= name =3D=3D=3D" + +echo '--- blkdebug ---' # Should work, because bdrv_dirname() works fine with blkdebug IMGOPTS=3D"subformat=3DmonolithicFlat" _make_test_img 64M $QEMU_IO -c "open -o driver=3D$IMGFMT,file.driver=3Dblkdebug,file.image.fi= lename=3D$TEST_IMG,file.inject-error.0.event=3Dread_aio" \ @@ -122,6 +124,31 @@ $QEMU_IO -c "open -o driver=3D$IMGFMT,file.driver=3Dbl= kdebug,file.image.filename=3D$TE | _filter_testdir | _filter_imgfmt | _filter_img_info _cleanup_test_img =20 +echo '--- quorum ---' +# Should not work, because bdrv_dirname() does not work with quorum +IMGOPTS=3D"subformat=3DmonolithicFlat" _make_test_img 64M +cp "$TEST_IMG" "$TEST_IMG.orig" + +filename=3D"json:{ + \"driver\": \"$IMGFMT\", + \"file\": { + \"driver\": \"quorum\", + \"children\": [ { + \"driver\": \"file\", + \"filename\": \"$TEST_IMG\" + }, { + \"driver\": \"file\", + \"filename\": \"$TEST_IMG.orig\" + } ], + \"vote-threshold\": 1 + } }" + +filename=3D$(echo "$filename" | tr '\n' ' ' | sed -e 's/\s\+/ /g') +$QEMU_IMG info "$filename" 2>&1 \ + | sed -e "s/'json:[^']*'/\$QUORUM_FILE/g" \ + | _filter_testdir | _filter_imgfmt | _filter_img_info + + echo echo "=3D=3D=3D Testing version 3 =3D=3D=3D" _use_sample_img iotest-version3.vmdk.bz2 diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 120cddd207..f8895ba434 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -2049,10 +2049,14 @@ 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 +--- blkdebug --- Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 format name: IMGFMT cluster size: 0 bytes vm state offset: 0 bytes +--- quorum --- +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 +qemu-img: Could not open $QUORUM_FILE: Cannot use relative paths with VMDK= descriptor file $QUORUM_FILE: Cannot generate a base directory for quorum = nodes =20 =3D=3D=3D Testing version 3 =3D=3D=3D image: TEST_DIR/iotest-version3.IMGFMT --=20 2.21.0 From nobody Sat Feb 7 03:55:55 2026 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=1565883799; cv=none; d=zoho.com; s=zohoarc; b=kkp3hpb86bGxNlEhxGef3TGQJG/6Ihju2pk+dDbFLyuSVnBoddPvv0q5kRgl1cQG0wdCLLYg5xGpvvtnLEV6uFLJmowUy8T4EqjOPDzSw1TDk2jfrb4tMcG4jm/vFo1DBgz8+ZRQP+IqfeOBssXgiLMNFYM9DqpG+Uvx6CPAuxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565883799; 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=clApEAUXSmQa9QjL/pita6uTlygGikO6uNBwlSy8IY0=; b=fWmm1WjJDuI7Oy/rCm27K1AS1Qp/OTLY7c1Yeat01cSWKSqK4f+Q+yiSbIpJ05DcwicYaJ5p16vsBoUOGJxsQ/X9d/FftsQzX7TeZxtnQmj4ln34ZPGHT9QlM5dBvUf2OrlR2UjSbuEg/k6lTDHGNYW6WKGo8uO60P/bd3NkgLg= 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 1565883799730733.4854418479053; Thu, 15 Aug 2019 08:43:19 -0700 (PDT) Received: from localhost ([::1]:43288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHuI-000453-FI for importer@patchew.org; Thu, 15 Aug 2019 11:43:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38860) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHoR-0005CO-GL for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyHoN-0000UM-UJ for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38546) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyHoC-0000PJ-62; Thu, 15 Aug 2019 11:37:00 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8258144BD1; Thu, 15 Aug 2019 15:36:59 +0000 (UTC) Received: from localhost (ovpn-204-81.brq.redhat.com [10.40.204.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DA71967626; Thu, 15 Aug 2019 15:36:56 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Thu, 15 Aug 2019 17:36:35 +0200 Message-Id: <20190815153638.4600-5-mreitz@redhat.com> In-Reply-To: <20190815153638.4600-1-mreitz@redhat.com> References: <20190815153638.4600-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 15 Aug 2019 15:36:59 +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] [PATCH v2 4/7] vmdk: Reject invalid compressed writes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Compressed writes generally have to write full clusters, not just in theory but also in practice when it comes to vmdk's streamOptimized subformat. It currently is just silently broken for writes with non-zero in-cluster offsets: $ qemu-img create -f vmdk -o subformat=3DstreamOptimized foo.vmdk 1M $ qemu-io -c 'write 4k 4k' -c 'read 4k 4k' foo.vmdk wrote 4096/4096 bytes at offset 4096 4 KiB, 1 ops; 00.01 sec (443.724 KiB/sec and 110.9309 ops/sec) read failed: Invalid argument (The technical reason is that vmdk_write_extent() just writes the incomplete compressed data actually to offset 4k. When reading the data, vmdk_read_extent() looks at offset 0 and finds the compressed data size to be 0, because that is what it reads from there. This yields an error.) For incomplete writes with zero in-cluster offsets, the error path when reading the rest of the cluster is a bit different, but the result is the same: $ qemu-img create -f vmdk -o subformat=3DstreamOptimized foo.vmdk 1M $ qemu-io -c 'write 0k 4k' -c 'read 4k 4k' foo.vmdk wrote 4096/4096 bytes at offset 0 4 KiB, 1 ops; 00.01 sec (362.641 KiB/sec and 90.6603 ops/sec) read failed: Invalid argument (Here, vmdk_read_extent() finds the data and then sees that the uncompressed data is short.) It is better to reject invalid writes than to make the user believe they might have succeeded and then fail when trying to read it back. Signed-off-by: Max Reitz Reviewed-by: John Snow --- block/vmdk.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block/vmdk.c b/block/vmdk.c index 825222de55..94a7021fcc 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1731,6 +1731,16 @@ static int vmdk_write_extent(VmdkExtent *extent, int= 64_t cluster_offset, if (extent->compressed) { void *compressed_data; =20 + /* Only whole clusters */ + if (offset_in_cluster || + n_bytes > (extent->cluster_sectors * SECTOR_SIZE) || + (n_bytes < (extent->cluster_sectors * SECTOR_SIZE) && + offset + n_bytes !=3D extent->end_sector * SECTOR_SIZE)) + { + ret =3D -EINVAL; + goto out; + } + if (!extent->has_marker) { ret =3D -EINVAL; goto out; --=20 2.21.0 From nobody Sat Feb 7 03:55:55 2026 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=1565883691; cv=none; d=zoho.com; s=zohoarc; b=TWsl4iuJNmumEHGySHEgQsmd56oAzIbBJDPBelfA5fEqtyb/B+XTt/EAyNI3iSIbOaJymy5nsM/iM0gsJM25+vFAj/uFav2PAwLBP1Jz+7/m3lYAMtIqW7mC09e9kO0V3PsL6HD2eIe8w0j9s+eRO3u6tuJhSBbqxDK2tFpHUos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565883691; 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=LE6usGtB2y4Z5WaejTB9jmrgE8EAO68QXzy90KXCeQE=; b=jOfT4Bkz8uHbcHGy79HDfBYUL2xm3KdPJcmm6yt3sVTb+sB8TN0SfG5C8QxzRj5TOD/oNpNKl8WFbTiytHP8JXIZCx0LWXgjr7rKTcC0FVWBImhNiQ0P+YYmVA/JxKeWM/8bxLwcb/QXmA4B48bCWbMBNmdoHlEc0ufiqA+Y4+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= (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 1565883691847860.7217985360122; Thu, 15 Aug 2019 08:41:31 -0700 (PDT) Received: from localhost ([::1]:43272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHsY-0001uo-Iv for importer@patchew.org; Thu, 15 Aug 2019 11:41:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38855) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHoR-0005Bl-1O for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyHoM-0000To-Rv for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33866) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyHoE-0000QQ-NC; Thu, 15 Aug 2019 11:37:02 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0292F3064FD4; Thu, 15 Aug 2019 15:37:02 +0000 (UTC) Received: from localhost (ovpn-204-81.brq.redhat.com [10.40.204.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6117B5C22F; Thu, 15 Aug 2019 15:37:01 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Thu, 15 Aug 2019 17:36:36 +0200 Message-Id: <20190815153638.4600-6-mreitz@redhat.com> In-Reply-To: <20190815153638.4600-1-mreitz@redhat.com> References: <20190815153638.4600-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 15 Aug 2019 15:37:02 +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] [PATCH v2 5/7] iotests: Disable broken streamOptimized tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" streamOptimized does not support writes that do not span exactly one cluster. Furthermore, it cannot rewrite already allocated clusters. As such, many iotests do not work with it. Disable them. Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/002 | 1 + tests/qemu-iotests/003 | 1 + tests/qemu-iotests/005 | 3 ++- tests/qemu-iotests/009 | 1 + tests/qemu-iotests/010 | 1 + tests/qemu-iotests/011 | 1 + tests/qemu-iotests/017 | 3 ++- tests/qemu-iotests/018 | 3 ++- tests/qemu-iotests/019 | 3 ++- tests/qemu-iotests/020 | 3 ++- tests/qemu-iotests/027 | 1 + tests/qemu-iotests/032 | 1 + tests/qemu-iotests/033 | 1 + tests/qemu-iotests/034 | 3 ++- tests/qemu-iotests/037 | 3 ++- tests/qemu-iotests/063 | 3 ++- tests/qemu-iotests/072 | 1 + tests/qemu-iotests/105 | 3 ++- tests/qemu-iotests/197 | 1 + tests/qemu-iotests/215 | 1 + tests/qemu-iotests/251 | 1 + 21 files changed, 30 insertions(+), 9 deletions(-) diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002 index fd413bce48..1a0d411df5 100755 --- a/tests/qemu-iotests/002 +++ b/tests/qemu-iotests/002 @@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt generic _supported_proto generic +_unsupported_imgopts "subformat=3DstreamOptimized" =20 =20 size=3D128M diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003 index ccd3a39dfb..33eeade0de 100755 --- a/tests/qemu-iotests/003 +++ b/tests/qemu-iotests/003 @@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt generic _supported_proto generic +_unsupported_imgopts "subformat=3DstreamOptimized" =20 size=3D128M offset=3D67M diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 index 9c7681c19b..58442762fe 100755 --- a/tests/qemu-iotests/005 +++ b/tests/qemu-iotests/005 @@ -43,7 +43,8 @@ _supported_fmt generic _supported_proto generic _supported_os Linux _unsupported_imgopts "subformat=3DtwoGbMaxExtentFlat" \ - "subformat=3DtwoGbMaxExtentSparse" + "subformat=3DtwoGbMaxExtentSparse" \ + "subformat=3DstreamOptimized" =20 # vpc is limited to 127GB, so we can't test it here if [ "$IMGFMT" =3D "vpc" ]; then diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 index 51b200db1d..4dc7d210f9 100755 --- a/tests/qemu-iotests/009 +++ b/tests/qemu-iotests/009 @@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt generic _supported_proto generic +_unsupported_imgopts "subformat=3DstreamOptimized" =20 =20 size=3D6G diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010 index 48c533f632..df809b3088 100755 --- a/tests/qemu-iotests/010 +++ b/tests/qemu-iotests/010 @@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt generic _supported_proto generic +_unsupported_imgopts "subformat=3DstreamOptimized" =20 =20 size=3D6G diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011 index 56f704b5b9..57b99ae4a9 100755 --- a/tests/qemu-iotests/011 +++ b/tests/qemu-iotests/011 @@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt generic _supported_proto generic +_unsupported_imgopts "subformat=3DstreamOptimized" =20 =20 size=3D6G diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 index 79875de454..0a4b854e65 100755 --- a/tests/qemu-iotests/017 +++ b/tests/qemu-iotests/017 @@ -41,7 +41,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow qcow2 vmdk qed _supported_proto generic _unsupported_proto vxhs -_unsupported_imgopts "subformat=3DmonolithicFlat" "subformat=3DtwoGbMaxExt= entFlat" +_unsupported_imgopts "subformat=3DmonolithicFlat" "subformat=3DtwoGbMaxExt= entFlat" \ + "subformat=3DstreamOptimized" =20 TEST_OFFSETS=3D"0 4294967296" =20 diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 index 78169838ba..c69ce09209 100755 --- a/tests/qemu-iotests/018 +++ b/tests/qemu-iotests/018 @@ -41,7 +41,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow qcow2 vmdk qed _supported_proto file _supported_os Linux -_unsupported_imgopts "subformat=3DmonolithicFlat" "subformat=3DtwoGbMaxExt= entFlat" +_unsupported_imgopts "subformat=3DmonolithicFlat" "subformat=3DtwoGbMaxExt= entFlat" \ + "streamOptimized" =20 TEST_OFFSETS=3D"0 4294967296" =20 diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 index a56dd30bed..b4f5234609 100755 --- a/tests/qemu-iotests/019 +++ b/tests/qemu-iotests/019 @@ -47,7 +47,8 @@ _supported_proto file _supported_os Linux _unsupported_imgopts "subformat=3DmonolithicFlat" \ "subformat=3DtwoGbMaxExtentFlat" \ - "subformat=3DtwoGbMaxExtentSparse" + "subformat=3DtwoGbMaxExtentSparse" \ + "subformat=3DstreamOptimized" =20 TEST_OFFSETS=3D"0 4294967296" CLUSTER_SIZE=3D65536 diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index 6b0ebb37d2..f41b92f35f 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -44,7 +44,8 @@ _supported_fmt qcow qcow2 vmdk qed _supported_proto file _unsupported_imgopts "subformat=3DmonolithicFlat" \ "subformat=3DtwoGbMaxExtentFlat" \ - "subformat=3DtwoGbMaxExtentSparse" + "subformat=3DtwoGbMaxExtentSparse" \ + "subformat=3DstreamOptimized" =20 TEST_OFFSETS=3D"0 4294967296" =20 diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027 index 4cb638022a..494be0921f 100755 --- a/tests/qemu-iotests/027 +++ b/tests/qemu-iotests/027 @@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt vmdk qcow qcow2 qed _supported_proto generic +_unsupported_imgopts "subformat=3DstreamOptimized" =20 =20 size=3D128M diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032 index 988a8c5d8f..8337a4d825 100755 --- a/tests/qemu-iotests/032 +++ b/tests/qemu-iotests/032 @@ -42,6 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This works for any image format (though unlikely to segfault for raw) _supported_fmt generic _supported_proto generic +_unsupported_imgopts "subformat=3DstreamOptimized" =20 echo echo =3D=3D=3D Prepare image =3D=3D=3D diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 index 362a48c0a0..8b40991d55 100755 --- a/tests/qemu-iotests/033 +++ b/tests/qemu-iotests/033 @@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt generic _supported_proto generic +_unsupported_imgopts "subformat=3DstreamOptimized" =20 =20 size=3D128M diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034 index 324bed28c6..da4cea1571 100755 --- a/tests/qemu-iotests/034 +++ b/tests/qemu-iotests/034 @@ -41,7 +41,8 @@ _supported_proto file _supported_os Linux _unsupported_imgopts "subformat=3DmonolithicFlat" \ "subformat=3DtwoGbMaxExtentFlat" \ - "subformat=3DtwoGbMaxExtentSparse" + "subformat=3DtwoGbMaxExtentSparse" \ + "subformat=3DstreamOptimized" =20 CLUSTER_SIZE=3D4k size=3D128M diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037 index 4946b9be92..e6517acbd4 100755 --- a/tests/qemu-iotests/037 +++ b/tests/qemu-iotests/037 @@ -40,7 +40,8 @@ _supported_fmt qcow qcow2 vmdk qed _supported_proto file _unsupported_imgopts "subformat=3DmonolithicFlat" \ "subformat=3DtwoGbMaxExtentFlat" \ - "subformat=3DtwoGbMaxExtentSparse" + "subformat=3DtwoGbMaxExtentSparse" \ + "subformat=3DstreamOptimized" =20 CLUSTER_SIZE=3D4k size=3D128M diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 index fe4892e467..7cf0427af4 100755 --- a/tests/qemu-iotests/063 +++ b/tests/qemu-iotests/063 @@ -43,7 +43,8 @@ _supported_fmt qcow qcow2 vmdk qed raw _supported_proto file _unsupported_imgopts "subformat=3DmonolithicFlat" \ "subformat=3DtwoGbMaxExtentFlat" \ - "subformat=3DtwoGbMaxExtentSparse" + "subformat=3DtwoGbMaxExtentSparse" \ + "subformat=3DstreamOptimized" =20 _make_test_img 4M =20 diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072 index 661b36da2d..f0b73e7e65 100755 --- a/tests/qemu-iotests/072 +++ b/tests/qemu-iotests/072 @@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow _supported_proto file +_unsupported_imgopts "subformat=3DstreamOptimized" =20 IMG_SIZE=3D64M =20 diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105 index 3346e8cb25..4d55a2d3ef 100755 --- a/tests/qemu-iotests/105 +++ b/tests/qemu-iotests/105 @@ -39,7 +39,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 vmdk vhdx qed _supported_proto generic _unsupported_imgopts "subformat=3DtwoGbMaxExtentFlat" \ - "subformat=3DtwoGbMaxExtentSparse" + "subformat=3DtwoGbMaxExtentSparse" \ + "subformat=3DstreamOptimized" =20 echo echo "creating large image" diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 index 383d7d7f61..1d4f6786db 100755 --- a/tests/qemu-iotests/197 +++ b/tests/qemu-iotests/197 @@ -53,6 +53,7 @@ _supported_fmt generic _supported_proto generic # LUKS support may be possible, but it complicates things. _unsupported_fmt luks +_unsupported_imgopts "subformat=3DstreamOptimized" =20 echo echo '=3D=3D=3D Copy-on-read =3D=3D=3D' diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215 index 958c14f5a0..2eb377d682 100755 --- a/tests/qemu-iotests/215 +++ b/tests/qemu-iotests/215 @@ -50,6 +50,7 @@ _supported_fmt generic _supported_proto generic # LUKS support may be possible, but it complicates things. _unsupported_fmt luks +_unsupported_imgopts "subformat=3DstreamOptimized" =20 echo echo '=3D=3D=3D Copy-on-read =3D=3D=3D' diff --git a/tests/qemu-iotests/251 b/tests/qemu-iotests/251 index 13f85de9cd..7918ba3559 100755 --- a/tests/qemu-iotests/251 +++ b/tests/qemu-iotests/251 @@ -40,6 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt generic _supported_proto file _supported_os Linux +_unsupported_imgopts "subformat=3DstreamOptimized" =20 if [ "$IMGOPTSSYNTAX" =3D "true" ]; then # We use json:{} filenames here, so we cannot work with additional opt= ions. --=20 2.21.0 From nobody Sat Feb 7 03:55:55 2026 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=1565883797; cv=none; d=zoho.com; s=zohoarc; b=nIuV7sdS+9n62kk5jY744NkSSUxEQqJVrQ34eZsffwXr6u/Pw61aSccTlDdRAisMXtZ1uQIJxdioUIYH3m2utvTJYFu2nu1sKxoMhY/tZGLwSkYchzPVp7PQF/OKlSZogTLYg199k2r6z7nE1c38gKwAANE4MXx72Zvs/snGvXU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565883797; 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=cr2s3b+8VyA6LMOvkcMuzoT33eltVWCnn67dUAvZciA=; b=XMYh7YP0SOvvY2mimr2bgDFPCM2ko2qaCXpLKOpMbgPaOqvRoutzDKDnzVQ+HhdTlBYIMeSyHa7b28OmYWNM4+YZXoOaGakbxfA9v+ZeicUs+Ur+Xp6pEmoPUNavQAl36P9ea8GHjwZTlT3zVrDjAG5Rr+hHXeTBTpeDvwBMEoc= 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 15658837978578.681086602029495; Thu, 15 Aug 2019 08:43:17 -0700 (PDT) Received: from localhost ([::1]:43286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHuC-0003ug-DB for importer@patchew.org; Thu, 15 Aug 2019 11:43:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38897) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHoV-0005Ib-6P for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyHoR-0000VY-SB for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51604) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyHoJ-0000SC-7r; Thu, 15 Aug 2019 11:37:07 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9010F30BEBED; Thu, 15 Aug 2019 15:37:06 +0000 (UTC) Received: from localhost (ovpn-204-81.brq.redhat.com [10.40.204.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DA116841DE; Thu, 15 Aug 2019 15:37:03 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Thu, 15 Aug 2019 17:36:37 +0200 Message-Id: <20190815153638.4600-7-mreitz@redhat.com> In-Reply-To: <20190815153638.4600-1-mreitz@redhat.com> References: <20190815153638.4600-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 15 Aug 2019 15:37:06 +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] [PATCH v2 6/7] iotests: Disable 110 for vmdk.twoGbMaxExtentSparse X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The error message for the test case where we have a quorum node for which no directory name can be generated is different: For twoGbMaxExtentSparse, it complains that it cannot open the extent file. For other (sub)formats, it just notes that it cannot determine the backing file path. Both are fine, but just disable twoGbMaxExtentSparse for simplicity's sake. Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/110 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 index 2cdc7c8a72..2ef516baf1 100755 --- a/tests/qemu-iotests/110 +++ b/tests/qemu-iotests/110 @@ -40,7 +40,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Any format supporting backing files _supported_fmt qed qcow qcow2 vmdk _supported_proto file -_unsupported_imgopts "subformat=3DmonolithicFlat" "subformat=3DtwoGbMaxExt= entFlat" +_unsupported_imgopts "subformat=3DmonolithicFlat" "subformat=3DtwoGbMaxExt= entFlat" \ + "subformat=3DtwoGbMaxExtentSparse" =20 TEST_IMG_REL=3D$(basename "$TEST_IMG") =20 --=20 2.21.0 From nobody Sat Feb 7 03:55:55 2026 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=1565883662; cv=none; d=zoho.com; s=zohoarc; b=bpj6WmAT4p2cTjSaXnUhcBtsZXeim5arsprNqXmPWZMKg9dWzKUktxsbY8yK5GVcCMJw8OLIO8ycm4cvDMGApNOH5fVBhMx00HAMqsB6OXt/jAn4Dy2Rwne+/nZJXa6jq00Q8tMePTQTdZcXl1NzSw+FtnfQ4X5xwCYqNhqF5Ts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565883662; 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=G+EbGNVjSNnNoj2RhTD3cQYFmkmEi9Cw0Xx6C7s3PqY=; b=NvGu0mV1GSlPkuOXwLS3AwOGe29VmJ7XsNlmL8+S1fJ1mKebh1A8N1gP8dVvTtwXgUDS8uPSljMDlXqBTOhP4757icwL5AkDf6d3q/hCAMbhiGStNcqr3wab/oOTRDq3vYsvNwx7fW7ZMuJBVvQkVR5dLOtzjdX3w/yoEPQx6r8= 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 1565883662976493.5258203215684; Thu, 15 Aug 2019 08:41:02 -0700 (PDT) Received: from localhost ([::1]:43268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHs5-0001Ox-Hx for importer@patchew.org; Thu, 15 Aug 2019 11:41:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38951) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyHoa-0005SS-Aw for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyHoV-0000Wy-W3 for qemu-devel@nongnu.org; Thu, 15 Aug 2019 11:37:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56756) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyHoO-0000UE-4r; Thu, 15 Aug 2019 11:37:12 -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 76472302C07A; Thu, 15 Aug 2019 15:37:11 +0000 (UTC) Received: from localhost (ovpn-204-81.brq.redhat.com [10.40.204.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 72DC81797F; Thu, 15 Aug 2019 15:37:08 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Thu, 15 Aug 2019 17:36:38 +0200 Message-Id: <20190815153638.4600-8-mreitz@redhat.com> In-Reply-To: <20190815153638.4600-1-mreitz@redhat.com> References: <20190815153638.4600-1-mreitz@redhat.com> MIME-Version: 1.0 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.46]); Thu, 15 Aug 2019 15:37: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] [PATCH v2 7/7] iotests: Disable 126 for flat vmdk subformats X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" iotest 126 requires backing file support, which flat vmdks cannot offer. Skip this test for such subformats. Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/126 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126 index 9b0dcf9255..b7fce1e59d 100755 --- a/tests/qemu-iotests/126 +++ b/tests/qemu-iotests/126 @@ -33,6 +33,8 @@ status=3D1 # failure is the default! =20 # Needs backing file support _supported_fmt qcow qcow2 qed vmdk +_unsupported_imgopts "subformat=3DmonolithicFlat" \ + "subformat=3DtwoGbMaxExtentFlat" # This is the default protocol (and we want to test the difference between # colons which separate a protocol prefix from the rest and colons which a= re # just part of the filename, so we cannot test protocols which require a p= refix) --=20 2.21.0