From nobody Fri Oct 24 09:38:24 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 1519414651036201.27810517769876; Fri, 23 Feb 2018 11:37:31 -0800 (PST) Received: from localhost ([::1]:46748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epJ9p-0001Bl-Pw for importer@patchew.org; Fri, 23 Feb 2018 14:37:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epIzU-00013Z-Ay for qemu-devel@nongnu.org; Fri, 23 Feb 2018 14:26:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epIzT-0004vS-3O for qemu-devel@nongnu.org; Fri, 23 Feb 2018 14:26:44 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:42262 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 1epIzN-0004nN-QA; Fri, 23 Feb 2018 14:26:37 -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 66EBB40FB64A; Fri, 23 Feb 2018 19:26:37 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-118.ams2.redhat.com [10.36.117.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC9142024CAC; Fri, 23 Feb 2018 19:26:35 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 23 Feb 2018 20:25:34 +0100 Message-Id: <20180223192549.26666-22-kwolf@redhat.com> In-Reply-To: <20180223192549.26666-1-kwolf@redhat.com> References: <20180223192549.26666-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.7]); Fri, 23 Feb 2018 19:26:37 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Feb 2018 19:26:37 +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 v3 21/36] rbd: Pass BlockdevOptionsRbd to 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" With the conversion to a QAPI options object, the function is now prepared to be used in a .bdrv_co_create implementation. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block/rbd.c | 109 +++++++++++++++++++++++++++++---------------------------= ---- 1 file changed, 53 insertions(+), 56 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 2e79c2d1fd..9b247f020d 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -24,6 +24,8 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h" +#include "qapi/qobject-input-visitor.h" +#include "qapi-visit.h" =20 /* * When specifying the image filename use: @@ -482,29 +484,27 @@ static void qemu_rbd_complete_aio(RADOSCB *rcb) qemu_aio_unref(acb); } =20 -static char *qemu_rbd_mon_host(QDict *options, Error **errp) +static char *qemu_rbd_mon_host(BlockdevOptionsRbd *opts, Error **errp) { - const char **vals =3D g_new(const char *, qdict_size(options) + 1); - char keybuf[32]; + const char **vals; const char *host, *port; char *rados_str; - int i; - - for (i =3D 0;; i++) { - sprintf(keybuf, "server.%d.host", i); - host =3D qdict_get_try_str(options, keybuf); - qdict_del(options, keybuf); - sprintf(keybuf, "server.%d.port", i); - port =3D qdict_get_try_str(options, keybuf); - qdict_del(options, keybuf); - if (!host && !port) { - break; - } - if (!host) { - error_setg(errp, "Parameter server.%d.host is missing", i); - rados_str =3D NULL; - goto out; - } + InetSocketAddressBaseList *p; + int i, cnt; + + if (!opts->has_server) { + return NULL; + } + + for (cnt =3D 0, p =3D opts->server; p; p =3D p->next) { + cnt++; + } + + vals =3D g_new(const char *, cnt + 1); + + for (i =3D 0, p =3D opts->server; p; p =3D p->next, i++) { + host =3D p->value->host; + port =3D p->value->port; =20 if (strchr(host, ':')) { vals[i] =3D port ? g_strdup_printf("[%s]:%s", host, port) @@ -517,63 +517,40 @@ static char *qemu_rbd_mon_host(QDict *options, Error = **errp) vals[i] =3D NULL; =20 rados_str =3D i ? g_strjoinv(";", (char **)vals) : NULL; -out: g_strfreev((char **)vals); return rados_str; } =20 static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx, char **s_snap, char **s_image_name, - QDict *options, bool cache, + BlockdevOptionsRbd *opts, bool cache, const char *keypairs, const char *secretid, Error **errp) { - QemuOpts *opts; char *mon_host =3D NULL; - const char *pool, *snap, *conf, *user, *image_name; Error *local_err =3D NULL; int r; =20 - opts =3D qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); - qemu_opts_absorb_qdict(opts, options, &local_err); - if (local_err) { - error_propagate(errp, local_err); - r =3D -EINVAL; - goto failed_opts; - } - - mon_host =3D qemu_rbd_mon_host(options, &local_err); + mon_host =3D qemu_rbd_mon_host(opts, &local_err); if (local_err) { error_propagate(errp, local_err); r =3D -EINVAL; goto failed_opts; } =20 - pool =3D qemu_opt_get(opts, "pool"); - conf =3D qemu_opt_get(opts, "conf"); - snap =3D qemu_opt_get(opts, "snapshot"); - user =3D qemu_opt_get(opts, "user"); - image_name =3D qemu_opt_get(opts, "image"); - - if (!pool || !image_name) { - error_setg(errp, "Parameters 'pool' and 'image' are required"); - r =3D -EINVAL; - goto failed_opts; - } - - r =3D rados_create(cluster, user); + r =3D rados_create(cluster, opts->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(opts->snapshot); + *s_image_name =3D g_strdup(opts->image); =20 /* try default location when conf=3DNULL, but ignore failure */ - r =3D rados_conf_read_file(*cluster, conf); - if (conf && r < 0) { - error_setg_errno(errp, -r, "error reading conf file %s", conf); + r =3D rados_conf_read_file(*cluster, opts->conf); + if (opts->has_conf && r < 0) { + error_setg_errno(errp, -r, "error reading conf file %s", opts->con= f); goto failed_shutdown; } =20 @@ -613,13 +590,12 @@ static int qemu_rbd_connect(rados_t *cluster, rados_i= octx_t *io_ctx, goto failed_shutdown; } =20 - r =3D rados_ioctx_create(*cluster, pool, io_ctx); + r =3D rados_ioctx_create(*cluster, opts->pool, io_ctx); if (r < 0) { - error_setg_errno(errp, -r, "error opening pool %s", pool); + error_setg_errno(errp, -r, "error opening pool %s", opts->pool); goto failed_shutdown; } =20 - qemu_opts_del(opts); return 0; =20 failed_shutdown: @@ -627,7 +603,6 @@ failed_shutdown: g_free(*s_snap); g_free(*s_image_name); failed_opts: - qemu_opts_del(opts); g_free(mon_host); return r; } @@ -636,6 +611,9 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *o= ptions, int flags, Error **errp) { BDRVRBDState *s =3D bs->opaque; + BlockdevOptionsRbd *opts =3D NULL; + Visitor *v; + QObject *crumpled =3D NULL; Error *local_err =3D NULL; const char *filename; char *keypairs, *secretid; @@ -666,8 +644,26 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *= options, int flags, qdict_del(options, "password-secret"); } =20 + /* Convert the remaining options into a QAPI object */ + crumpled =3D qdict_crumple(options, errp); + if (crumpled =3D=3D NULL) { + r =3D -EINVAL; + goto out; + } + + v =3D qobject_input_visitor_new_keyval(crumpled); + visit_type_BlockdevOptionsRbd(v, NULL, &opts, &local_err); + visit_free(v); + qobject_decref(crumpled); + + if (local_err) { + error_propagate(errp, local_err); + r =3D -EINVAL; + goto out; + } + r =3D qemu_rbd_connect(&s->cluster, &s->io_ctx, &s->snap, &s->image_na= me, - options, !(flags & BDRV_O_NOCACHE), keypairs, sec= retid, + opts, !(flags & BDRV_O_NOCACHE), keypairs, secret= id, errp); if (r < 0) { goto out; @@ -706,6 +702,7 @@ failed_open: g_free(s->image_name); rados_shutdown(s->cluster); out: + qapi_free_BlockdevOptionsRbd(opts); g_free(keypairs); g_free(secretid); return r; --=20 2.13.6