From nobody Wed Dec 17 05:38:40 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520959013348953.9125494167083; Tue, 13 Mar 2018 09:36:53 -0700 (PDT) Received: from localhost ([::1]:41104 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmuy-0000HL-Hl for importer@patchew.org; Tue, 13 Mar 2018 12:36:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmdY-0001q6-Pq for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:18:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmdW-0004st-CS for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:18:52 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37596 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 1evmdT-0004p7-1b; Tue, 13 Mar 2018 12:18:47 -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 ABE3540201A3; Tue, 13 Mar 2018 16:18:46 +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 DD6AF215CDAF; Tue, 13 Mar 2018 16:18:45 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 13 Mar 2018 17:17:59 +0100 Message-Id: <20180313161803.1814-38-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.6]); Tue, 13 Mar 2018 16:18:46 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 13 Mar 2018 16:18:46 +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 37/41] vdi: Make comments consistent with other drivers 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" This makes the .bdrv_co_create(_opts) implementation of vdi look more like the other recently converted block drivers. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block/vdi.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 8132e3adfe..d939b034c4 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -742,7 +742,7 @@ static int coroutine_fn vdi_co_do_create(BlockdevCreate= Options *create_options, =20 logout("\n"); =20 - /* Read out options. */ + /* Validate options and set default values */ bytes =3D vdi_opts->size; if (vdi_opts->q_static) { image_type =3D VDI_TYPE_STATIC; @@ -772,6 +772,7 @@ static int coroutine_fn vdi_co_do_create(BlockdevCreate= Options *create_options, goto exit; } =20 + /* Create BlockBackend to write to the image */ bs_file =3D bdrv_open_blockdev_ref(vdi_opts->file, errp); if (!bs_file) { ret =3D -EIO; @@ -877,7 +878,9 @@ static int coroutine_fn vdi_co_create_opts(const char *= filename, QemuOpts *opts, Error *local_err =3D NULL; int ret; =20 - /* Since CONFIG_VDI_BLOCK_SIZE is disabled by default, + /* Parse options and convert legacy syntax. + * + * Since CONFIG_VDI_BLOCK_SIZE is disabled by default, * cluster-size is not part of the QAPI schema; therefore we have * to parse it before creating the QAPI object. */ #if defined(CONFIG_VDI_BLOCK_SIZE) @@ -895,6 +898,7 @@ 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 + /* Create and open the file (protocol layer) */ ret =3D bdrv_create_file(filename, opts, errp); if (ret < 0) { goto done; @@ -921,10 +925,12 @@ static int coroutine_fn vdi_co_create_opts(const char= *filename, QemuOpts *opts, goto done; } =20 + /* Silently round up size */ assert(create_options->driver =3D=3D BLOCKDEV_DRIVER_VDI); create_options->u.vdi.size =3D ROUND_UP(create_options->u.vdi.size, BDRV_SECTOR_SIZE); =20 + /* Create the vdi image (format layer) */ ret =3D vdi_co_do_create(create_options, block_size, errp); done: QDECREF(qdict); @@ -981,8 +987,8 @@ static BlockDriver bdrv_vdi =3D { .bdrv_close =3D vdi_close, .bdrv_reopen_prepare =3D vdi_reopen_prepare, .bdrv_child_perm =3D bdrv_format_default_perms, - .bdrv_co_create_opts =3D vdi_co_create_opts, .bdrv_co_create =3D vdi_co_create, + .bdrv_co_create_opts =3D vdi_co_create_opts, .bdrv_has_zero_init =3D bdrv_has_zero_init_1, .bdrv_co_block_status =3D vdi_co_block_status, .bdrv_make_empty =3D vdi_make_empty, --=20 2.13.6