From nobody Fri Oct 24 09:38:22 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 1519415019004792.4949040106769; Fri, 23 Feb 2018 11:43:39 -0800 (PST) Received: from localhost ([::1]:46799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epJFq-0006rD-60 for importer@patchew.org; Fri, 23 Feb 2018 14:43:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epIzW-00015P-0K for qemu-devel@nongnu.org; Fri, 23 Feb 2018 14:26:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epIzU-0004yo-SD for qemu-devel@nongnu.org; Fri, 23 Feb 2018 14:26:45 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50844 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 1epIzM-0004lV-0U; Fri, 23 Feb 2018 14:26:36 -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 918738D6EA; Fri, 23 Feb 2018 19:26:35 +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 036E12024CAC; Fri, 23 Feb 2018 19:26:33 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 23 Feb 2018 20:25:33 +0100 Message-Id: <20180223192549.26666-21-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.2]); Fri, 23 Feb 2018 19:26:35 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 23 Feb 2018 19:26:35 +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 20/36] rbd: Remove non-schema options from runtime_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, 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" Instead of the QemuOpts in qemu_rbd_connect(), we want to use QAPI objects. As a preparation, fetch those options directly from the QDict that .bdrv_open() supports in the rbd driver and that are not in the schema. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block/rbd.c | 55 ++++++++++++++++++++++++------------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 4bbcce4eca..2e79c2d1fd 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -326,28 +326,6 @@ static QemuOptsList runtime_opts =3D { /* * server.* extracted manually, see qemu_rbd_mon_host() */ - { - .name =3D "password-secret", - .type =3D QEMU_OPT_STRING, - .help =3D "ID of secret providing the password", - }, - - /* - * Keys for qemu_rbd_parse_filename(), not in the QAPI schema - */ - { - /* - * HACK: name starts with '=3D' so that qemu_opts_parse() - * can't set it - */ - .name =3D "=3Dkeyvalue-pairs", - .type =3D QEMU_OPT_STRING, - .help =3D "Legacy rados key/value option parameters", - }, - { - .name =3D "filename", - .type =3D QEMU_OPT_STRING, - }, { /* end of list */ } }, }; @@ -546,12 +524,13 @@ out: =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, Error **errp) + QDict *options, 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, *keypairs; - const char *secretid; + const char *pool, *snap, *conf, *user, *image_name; Error *local_err =3D NULL; int r; =20 @@ -570,14 +549,11 @@ static int qemu_rbd_connect(rados_t *cluster, rados_i= octx_t *io_ctx, goto failed_opts; } =20 - secretid =3D qemu_opt_get(opts, "password-secret"); - 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"); - keypairs =3D qemu_opt_get(opts, "=3Dkeyvalue-pairs"); =20 if (!pool || !image_name) { error_setg(errp, "Parameters 'pool' and 'image' are required"); @@ -662,6 +638,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *o= ptions, int flags, BDRVRBDState *s =3D bs->opaque; Error *local_err =3D NULL; const char *filename; + char *keypairs, *secretid; int r; =20 /* If we are given a filename, parse the filename, with precedence giv= en to @@ -672,16 +649,28 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict = *options, int flags, "This is an unsupported option, and may be deprecated " "in the future"); qemu_rbd_parse_filename(filename, options, &local_err); + qdict_del(options, "filename"); if (local_err) { error_propagate(errp, local_err); return -EINVAL; } } =20 + keypairs =3D g_strdup(qdict_get_try_str(options, "=3Dkeyvalue-pairs")); + if (keypairs) { + qdict_del(options, "=3Dkeyvalue-pairs"); + } + + secretid =3D g_strdup(qdict_get_try_str(options, "password-secret")); + if (secretid) { + qdict_del(options, "password-secret"); + } + r =3D qemu_rbd_connect(&s->cluster, &s->io_ctx, &s->snap, &s->image_na= me, - options, !(flags & BDRV_O_NOCACHE), errp); + options, !(flags & BDRV_O_NOCACHE), keypairs, sec= retid, + errp); if (r < 0) { - return r; + goto out; } =20 /* rbd_open is always r/w */ @@ -708,13 +697,17 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict = *options, int flags, } } =20 - return 0; + r =3D 0; + goto out; =20 failed_open: rados_ioctx_destroy(s->io_ctx); g_free(s->snap); g_free(s->image_name); rados_shutdown(s->cluster); +out: + g_free(keypairs); + g_free(secretid); return r; } =20 --=20 2.13.6