From nobody Fri Oct 24 22:15:42 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 1519222472304654.2796501096121; Wed, 21 Feb 2018 06:14:32 -0800 (PST) Received: from localhost ([::1]:32835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoVAB-0000ob-Ha for importer@patchew.org; Wed, 21 Feb 2018 09:14:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoUrh-0001DP-3z for qemu-devel@nongnu.org; Wed, 21 Feb 2018 08:55:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eoUre-0002xE-D2 for qemu-devel@nongnu.org; Wed, 21 Feb 2018 08:55:21 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:33012 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 1eoUrV-0002qc-Lm; Wed, 21 Feb 2018 08:55:09 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 25467EB6F6; Wed, 21 Feb 2018 13:55:09 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-57.ams2.redhat.com [10.36.117.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CFCD2026E03; Wed, 21 Feb 2018 13:55:07 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Wed, 21 Feb 2018 14:53:47 +0100 Message-Id: <20180221135404.27598-20-kwolf@redhat.com> In-Reply-To: <20180221135404.27598-1-kwolf@redhat.com> References: <20180221135404.27598-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 21 Feb 2018 13:55:09 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 21 Feb 2018 13:55:09 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.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] [PATCH v2 19/36] rbd: Factor out qemu_rbd_connect() 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, jdurgin@redhat.com, pkrempa@redhat.com, mitake.hitoshi@lab.ntt.co.jp, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, namei.unix@gmail.com 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" The code to establish an RBD connection is duplicated between open and create. In order to be able to share the code, factor out the code from qemu_rbd_open() as a first step. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block/rbd.c | 100 ++++++++++++++++++++++++++++++++++++--------------------= ---- 1 file changed, 60 insertions(+), 40 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 27fa11b473..4bbcce4eca 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -544,32 +544,17 @@ out: return rados_str; } =20 -static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, - Error **errp) +static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx, + char **s_snap, char **s_image_name, + QDict *options, bool cache, Error **errp) { - BDRVRBDState *s =3D bs->opaque; - const char *pool, *snap, *conf, *user, *image_name, *keypairs; - const char *secretid, *filename; QemuOpts *opts; - Error *local_err =3D NULL; char *mon_host =3D NULL; + const char *pool, *snap, *conf, *user, *image_name, *keypairs; + const char *secretid; + Error *local_err =3D NULL; int r; =20 - /* If we are given a filename, parse the filename, with precedence giv= en to - * filename encoded options */ - filename =3D qdict_get_try_str(options, "filename"); - if (filename) { - warn_report("'filename' option specified. " - "This is an unsupported option, and may be deprecated " - "in the future"); - qemu_rbd_parse_filename(filename, options, &local_err); - if (local_err) { - r =3D -EINVAL; - error_propagate(errp, local_err); - goto exit; - } - } - opts =3D qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); qemu_opts_absorb_qdict(opts, options, &local_err); if (local_err) { @@ -600,35 +585,35 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict = *options, int flags, goto failed_opts; } =20 - r =3D rados_create(&s->cluster, user); + r =3D rados_create(cluster, user); if (r < 0) { error_setg_errno(errp, -r, "error initializing"); goto failed_opts; } =20 - s->snap =3D g_strdup(snap); - s->image_name =3D g_strdup(image_name); + *s_snap =3D g_strdup(snap); + *s_image_name =3D g_strdup(image_name); =20 /* try default location when conf=3DNULL, but ignore failure */ - r =3D rados_conf_read_file(s->cluster, conf); + r =3D rados_conf_read_file(*cluster, conf); if (conf && r < 0) { error_setg_errno(errp, -r, "error reading conf file %s", conf); goto failed_shutdown; } =20 - r =3D qemu_rbd_set_keypairs(s->cluster, keypairs, errp); + r =3D qemu_rbd_set_keypairs(*cluster, keypairs, errp); if (r < 0) { goto failed_shutdown; } =20 if (mon_host) { - r =3D rados_conf_set(s->cluster, "mon_host", mon_host); + r =3D rados_conf_set(*cluster, "mon_host", mon_host); if (r < 0) { goto failed_shutdown; } } =20 - if (qemu_rbd_set_auth(s->cluster, secretid, errp) < 0) { + if (qemu_rbd_set_auth(*cluster, secretid, errp) < 0) { r =3D -EIO; goto failed_shutdown; } @@ -640,24 +625,65 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict = *options, int flags, * librbd defaults to no caching. If write through caching cannot * be set up, fall back to no caching. */ - if (flags & BDRV_O_NOCACHE) { - rados_conf_set(s->cluster, "rbd_cache", "false"); + if (cache) { + rados_conf_set(*cluster, "rbd_cache", "true"); } else { - rados_conf_set(s->cluster, "rbd_cache", "true"); + rados_conf_set(*cluster, "rbd_cache", "false"); } =20 - r =3D rados_connect(s->cluster); + r =3D rados_connect(*cluster); if (r < 0) { error_setg_errno(errp, -r, "error connecting"); goto failed_shutdown; } =20 - r =3D rados_ioctx_create(s->cluster, pool, &s->io_ctx); + r =3D rados_ioctx_create(*cluster, pool, io_ctx); if (r < 0) { error_setg_errno(errp, -r, "error opening pool %s", pool); goto failed_shutdown; } =20 + qemu_opts_del(opts); + return 0; + +failed_shutdown: + rados_shutdown(*cluster); + g_free(*s_snap); + g_free(*s_image_name); +failed_opts: + qemu_opts_del(opts); + g_free(mon_host); + return r; +} + +static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, + Error **errp) +{ + BDRVRBDState *s =3D bs->opaque; + Error *local_err =3D NULL; + const char *filename; + int r; + + /* If we are given a filename, parse the filename, with precedence giv= en to + * filename encoded options */ + filename =3D qdict_get_try_str(options, "filename"); + if (filename) { + warn_report("'filename' option specified. " + "This is an unsupported option, and may be deprecated " + "in the future"); + qemu_rbd_parse_filename(filename, options, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return -EINVAL; + } + } + + r =3D qemu_rbd_connect(&s->cluster, &s->io_ctx, &s->snap, &s->image_na= me, + options, !(flags & BDRV_O_NOCACHE), errp); + if (r < 0) { + return r; + } + /* rbd_open is always r/w */ r =3D rbd_open(s->io_ctx, s->image_name, &s->image, s->snap); if (r < 0) { @@ -682,19 +708,13 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict = *options, int flags, } } =20 - qemu_opts_del(opts); return 0; =20 failed_open: rados_ioctx_destroy(s->io_ctx); -failed_shutdown: - rados_shutdown(s->cluster); g_free(s->snap); g_free(s->image_name); -failed_opts: - qemu_opts_del(opts); - g_free(mon_host); -exit: + rados_shutdown(s->cluster); return r; } =20 --=20 2.13.6