From nobody Wed Dec 17 21:47:33 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520959735898311.5849077213809; Tue, 13 Mar 2018 09:48:55 -0700 (PDT) Received: from localhost ([::1]:41183 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evn6d-0002Jj-3X for importer@patchew.org; Tue, 13 Mar 2018 12:48:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmdQ-0001g5-76 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:18:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmdP-0004mO-2q for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:18:44 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52282 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1evmdK-0004jK-Ny; Tue, 13 Mar 2018 12:18:38 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5BC69D1426; Tue, 13 Mar 2018 16:18:38 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-214.ams2.redhat.com [10.36.117.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D1AD2166BB2; Tue, 13 Mar 2018 16:18:37 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 13 Mar 2018 17:17:51 +0100 Message-Id: <20180313161803.1814-30-kwolf@redhat.com> In-Reply-To: <20180313161803.1814-1-kwolf@redhat.com> References: <20180313161803.1814-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Tue, 13 Mar 2018 16:18:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Tue, 13 Mar 2018 16:18:38 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 29/41] vdi: Move file creation to vdi_co_create_opts 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org 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" From: Max Reitz Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf --- block/vdi.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 0c8f8204ce..2a39b0ac98 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -721,9 +721,7 @@ nonallocating_write: return ret; } =20 -static int coroutine_fn vdi_co_do_create(const char *filename, - QemuOpts *file_opts, - BlockdevCreateOptionsVdi *vdi_opt= s, +static int coroutine_fn vdi_co_do_create(BlockdevCreateOptionsVdi *vdi_opt= s, size_t block_size, Error **errp) { int ret =3D 0; @@ -734,7 +732,7 @@ static int coroutine_fn vdi_co_do_create(const char *fi= lename, size_t i; size_t bmap_size; int64_t offset =3D 0; - Error *local_err =3D NULL; + BlockDriverState *bs_file =3D NULL; BlockBackend *blk =3D NULL; uint32_t *bmap =3D NULL; =20 @@ -770,18 +768,15 @@ static int coroutine_fn vdi_co_do_create(const char *= filename, goto exit; } =20 - ret =3D bdrv_create_file(filename, file_opts, &local_err); - if (ret < 0) { - error_propagate(errp, local_err); + bs_file =3D bdrv_open_blockdev_ref(vdi_opts->file, errp); + if (!bs_file) { + ret =3D -EIO; goto exit; } =20 - blk =3D blk_new_open(filename, NULL, NULL, - BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, - &local_err); - if (blk =3D=3D NULL) { - error_propagate(errp, local_err); - ret =3D -EIO; + blk =3D blk_new(BLK_PERM_WRITE | BLK_PERM_RESIZE, BLK_PERM_ALL); + ret =3D blk_insert_bs(blk, bs_file, errp); + if (ret < 0) { goto exit; } =20 @@ -818,7 +813,7 @@ static int coroutine_fn vdi_co_do_create(const char *fi= lename, vdi_header_to_le(&header); ret =3D blk_pwrite(blk, offset, &header, sizeof(header), 0); if (ret < 0) { - error_setg(errp, "Error writing header to %s", filename); + error_setg(errp, "Error writing header"); goto exit; } offset +=3D sizeof(header); @@ -839,7 +834,7 @@ static int coroutine_fn vdi_co_do_create(const char *fi= lename, } ret =3D blk_pwrite(blk, offset, bmap, bmap_size, 0); if (ret < 0) { - error_setg(errp, "Error writing bmap to %s", filename); + error_setg(errp, "Error writing bmap"); goto exit; } offset +=3D bmap_size; @@ -849,13 +844,14 @@ static int coroutine_fn vdi_co_do_create(const char *= filename, ret =3D blk_truncate(blk, offset + blocks * block_size, PREALLOC_MODE_OFF, errp); if (ret < 0) { - error_prepend(errp, "Failed to statically allocate %s", filena= me); + error_prepend(errp, "Failed to statically allocate file"); goto exit; } } =20 exit: blk_unref(blk); + bdrv_unref(bs_file); g_free(bmap); return ret; } @@ -865,6 +861,7 @@ static int coroutine_fn vdi_co_create_opts(const char *= filename, QemuOpts *opts, { QDict *qdict =3D NULL; BlockdevCreateOptionsVdi *create_options =3D NULL; + BlockDriverState *bs_file =3D NULL; uint64_t block_size =3D DEFAULT_CLUSTER_SIZE; Visitor *v; Error *local_err =3D NULL; @@ -888,7 +885,19 @@ static int coroutine_fn vdi_co_create_opts(const char = *filename, QemuOpts *opts, =20 qdict =3D qemu_opts_to_qdict_filtered(opts, NULL, &vdi_create_opts, tr= ue); =20 - qdict_put_str(qdict, "file", ""); /* FIXME */ + ret =3D bdrv_create_file(filename, opts, errp); + if (ret < 0) { + goto done; + } + + bs_file =3D bdrv_open(filename, NULL, NULL, + BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, err= p); + if (!bs_file) { + ret =3D -EIO; + goto done; + } + + qdict_put_str(qdict, "file", bs_file->node_name); =20 /* Get the QAPI object */ v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); @@ -903,10 +912,11 @@ static int coroutine_fn vdi_co_create_opts(const char= *filename, QemuOpts *opts, =20 create_options->size =3D ROUND_UP(create_options->size, BDRV_SECTOR_SI= ZE); =20 - ret =3D vdi_co_do_create(filename, opts, create_options, block_size, e= rrp); + ret =3D vdi_co_do_create(create_options, block_size, errp); done: QDECREF(qdict); qapi_free_BlockdevCreateOptionsVdi(create_options); + bdrv_unref(bs_file); return ret; } =20 --=20 2.13.6