From nobody Mon May 5 16:17:35 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=1566930691; cv=none;
d=zoho.com; s=zohoarc;
b=eb+DHoS5GffeZ4O36+IS1EP/5c37jNiV40oTrwSwjRrqlYDabhP4zDqcEuUQqiJ7rj1LBKRc1WU46r9aeWWs9vo22vjiNMepY9vdwRZsMaxATraWMOUbzUKDSLqSZvLennNrUJHly0YQrHLJmIQeKV3o3amI8gsQ3+qGJz+jO1s=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
s=zohoarc;
t=1566930691;
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=4J18hO+GRmiaGJq/N9aKdY51x2U8t/lSeIL9brBKMHc=;
b=ebkBdUyt/pVX5y+D/duCTr0IDpl56QWWBDv//bvJBLocKuhCoaMWJ1kXXRbKYJjJCDFNs8uBOZK9OxVPaBL5xz4W+ZjjKrYJwzRiHn74maAp3fVzFrQapVv9J+ycidTl0P6BwrGXGnCmiXlabZeV+fS/S5PbQFWLW0CH3ZitJR4=
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 1566930691973134.91457952938697;
Tue, 27 Aug 2019 11:31:31 -0700 (PDT)
Received: from localhost ([::1]:55496 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 1i2gFa-0000S0-De
for importer@patchew.org; Tue, 27 Aug 2019 14:31:26 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53305)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <mreitz@redhat.com>) id 1i2g80-0002qe-Gg
for qemu-devel@nongnu.org; Tue, 27 Aug 2019 14:23:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <mreitz@redhat.com>) id 1i2g7y-0005Rg-Nq
for qemu-devel@nongnu.org; Tue, 27 Aug 2019 14:23:36 -0400
Received: from mx1.redhat.com ([209.132.183.28]:58584)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <mreitz@redhat.com>)
id 1i2g7v-0005Oa-4w; Tue, 27 Aug 2019 14:23:31 -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 76F1881F18;
Tue, 27 Aug 2019 18:23:30 +0000 (UTC)
Received: from localhost (unknown [10.40.205.2])
by smtp.corp.redhat.com (Postfix) with ESMTPS id D467D60600;
Tue, 27 Aug 2019 18:23:29 +0000 (UTC)
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Date: Tue, 27 Aug 2019 20:23:04 +0200
Message-Id: <20190827182313.25983-7-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.13
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.27]); Tue, 27 Aug 2019 18:23:30 +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 06/15] vmdk: Use bdrv_dirname() for relative
extent paths
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"
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 <mreitz@redhat.com>
Message-id: 20190815153638.4600-3-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
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 fd78fd0ccf..a7f82e665e 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 b2e718d29f..a51b571d27 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