From nobody Wed Dec 17 05:35:41 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487963978973177.4750361918151; Fri, 24 Feb 2017 11:19:38 -0800 (PST) Received: from localhost ([::1]:39549 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chLOz-0003Fv-Ka for importer@patchew.org; Fri, 24 Feb 2017 14:19:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chKR2-0006js-FF for qemu-devel@nongnu.org; Fri, 24 Feb 2017 13:17:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chKR1-0002xC-6p for qemu-devel@nongnu.org; Fri, 24 Feb 2017 13:17:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40326) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chKQx-0002sn-RG; Fri, 24 Feb 2017 13:17:36 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 13E28624B0; Fri, 24 Feb 2017 18:17:36 +0000 (UTC) Received: from noname.redhat.com (ovpn-117-128.ams2.redhat.com [10.36.117.128]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1OIHDCP015460; Fri, 24 Feb 2017 13:17:35 -0500 From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 24 Feb 2017 19:17:07 +0100 Message-Id: <1487960230-18054-17-git-send-email-kwolf@redhat.com> In-Reply-To: <1487960230-18054-1-git-send-email-kwolf@redhat.com> References: <1487960230-18054-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 24 Feb 2017 18:17:36 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 16/19] block: Factor out bdrv_open_driver() 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, 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 is a function that doesn't do any option parsing, but just does some basic BlockDriverState setup and calls the .bdrv_open() function of the block driver. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block.c | 112 +++++++++++++++++++++++++++++++++++++-----------------------= ---- 1 file changed, 65 insertions(+), 47 deletions(-) diff --git a/block.c b/block.c index 5f1e8aa..f96d26b 100644 --- a/block.c +++ b/block.c @@ -925,6 +925,67 @@ out: g_free(gen_node_name); } =20 +static int bdrv_open_driver(BlockDriverState *bs, BlockDriver *drv, + const char *node_name, QDict *options, + int open_flags, Error **errp) +{ + Error *local_err =3D NULL; + int ret; + + bdrv_assign_node_name(bs, node_name, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return -EINVAL; + } + + bs->drv =3D drv; + bs->opaque =3D g_malloc0(drv->instance_size); + + if (drv->bdrv_file_open) { + assert(!drv->bdrv_needs_filename || bs->filename[0]); + ret =3D drv->bdrv_file_open(bs, options, open_flags, &local_err); + } else { + ret =3D drv->bdrv_open(bs, options, open_flags, &local_err); + } + + if (ret < 0) { + if (local_err) { + error_propagate(errp, local_err); + } else if (bs->filename[0]) { + error_setg_errno(errp, -ret, "Could not open '%s'", bs->filena= me); + } else { + error_setg_errno(errp, -ret, "Could not open image"); + } + goto free_and_fail; + } + + ret =3D refresh_total_sectors(bs, bs->total_sectors); + if (ret < 0) { + error_setg_errno(errp, -ret, "Could not refresh total sector count= "); + goto free_and_fail; + } + + bdrv_refresh_limits(bs, &local_err); + if (local_err) { + error_propagate(errp, local_err); + ret =3D -EINVAL; + goto free_and_fail; + } + + assert(bdrv_opt_mem_align(bs) !=3D 0); + assert(bdrv_min_mem_align(bs) !=3D 0); + assert(is_power_of_2(bs->bl.request_alignment)); + + return 0; + +free_and_fail: + /* FIXME Close bs first if already opened*/ + g_free(bs->opaque); + bs->opaque =3D NULL; + bs->drv =3D NULL; + return ret; +} + QemuOptsList bdrv_runtime_opts =3D { .name =3D "bdrv_common", .head =3D QTAILQ_HEAD_INITIALIZER(bdrv_runtime_opts.head), @@ -1019,14 +1080,6 @@ static int bdrv_open_common(BlockDriverState *bs, Bl= ockBackend *file, trace_bdrv_open_common(bs, filename ?: "", bs->open_flags, drv->format_name); =20 - node_name =3D qemu_opt_get(opts, "node-name"); - bdrv_assign_node_name(bs, node_name, &local_err); - if (local_err) { - error_propagate(errp, local_err); - ret =3D -EINVAL; - goto fail_opts; - } - bs->read_only =3D !(bs->open_flags & BDRV_O_RDWR); =20 if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv, bs->read_only)) { @@ -1092,54 +1145,19 @@ static int bdrv_open_common(BlockDriverState *bs, B= lockBackend *file, } pstrcpy(bs->exact_filename, sizeof(bs->exact_filename), bs->filename); =20 - bs->drv =3D drv; - bs->opaque =3D g_malloc0(drv->instance_size); - /* Open the image, either directly or using a protocol */ open_flags =3D bdrv_open_flags(bs, bs->open_flags); - if (drv->bdrv_file_open) { - assert(file =3D=3D NULL); - assert(!drv->bdrv_needs_filename || filename !=3D NULL); - ret =3D drv->bdrv_file_open(bs, options, open_flags, &local_err); - } else { - ret =3D drv->bdrv_open(bs, options, open_flags, &local_err); - } - - if (ret < 0) { - if (local_err) { - error_propagate(errp, local_err); - } else if (bs->filename[0]) { - error_setg_errno(errp, -ret, "Could not open '%s'", bs->filena= me); - } else { - error_setg_errno(errp, -ret, "Could not open image"); - } - goto free_and_fail; - } + node_name =3D qemu_opt_get(opts, "node-name"); =20 - ret =3D refresh_total_sectors(bs, bs->total_sectors); + assert(!drv->bdrv_file_open || file =3D=3D NULL); + ret =3D bdrv_open_driver(bs, drv, node_name, options, open_flags, errp= ); if (ret < 0) { - error_setg_errno(errp, -ret, "Could not refresh total sector count= "); - goto free_and_fail; - } - - bdrv_refresh_limits(bs, &local_err); - if (local_err) { - error_propagate(errp, local_err); - ret =3D -EINVAL; - goto free_and_fail; + goto fail_opts; } =20 - assert(bdrv_opt_mem_align(bs) !=3D 0); - assert(bdrv_min_mem_align(bs) !=3D 0); - assert(is_power_of_2(bs->bl.request_alignment)); - qemu_opts_del(opts); return 0; =20 -free_and_fail: - g_free(bs->opaque); - bs->opaque =3D NULL; - bs->drv =3D NULL; fail_opts: qemu_opts_del(opts); return ret; --=20 1.8.3.1