From nobody Sun Feb 8 23:19:07 2026 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 1488180995134692.4968227175762; Sun, 26 Feb 2017 23:36:35 -0800 (PST) Received: from localhost ([::1]:50843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciFrF-0002MB-QA for importer@patchew.org; Mon, 27 Feb 2017 02:36:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciFlj-0006ha-Is for qemu-devel@nongnu.org; Mon, 27 Feb 2017 02:30:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciFli-0006vk-Mm for qemu-devel@nongnu.org; Mon, 27 Feb 2017 02:30:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36598) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ciFld-0006ra-Pj; Mon, 27 Feb 2017 02:30:45 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (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 E344581236; Mon, 27 Feb 2017 07:30:45 +0000 (UTC) Received: from localhost (ovpn-116-95.phx2.redhat.com [10.3.116.95]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1R7Uibb023830 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 27 Feb 2017 02:30:45 -0500 From: Jeff Cody To: qemu-devel@nongnu.org Date: Mon, 27 Feb 2017 02:30:39 -0500 Message-Id: <6f1d60bdbbb4e82991c699d4aa6666c4317a1c5d.1488180142.git.jcody@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 27 Feb 2017 07:30:45 +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] [PATCH 2/4] block/rbd: code movement 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: armbru@redhat.com, qemu-block@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" Signed-off-by: Jeff Cody --- block/rbd.c | 64 +++++++++++++++++++++++++++++++++++++++++++--------------= ---- 1 file changed, 45 insertions(+), 19 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 3f1a9de..c8d4eb1 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -357,6 +357,51 @@ static void qemu_rbd_memset(RADOSCB *rcb, int64_t offs) } } =20 +static QemuOptsList runtime_opts =3D { + .name =3D "rbd", + .head =3D QTAILQ_HEAD_INITIALIZER(runtime_opts.head), + .desc =3D { + { + .name =3D "filename", + .type =3D QEMU_OPT_STRING, + .help =3D "Specification of the rbd image", + }, + { + .name =3D "password-secret", + .type =3D QEMU_OPT_STRING, + .help =3D "ID of secret providing the password", + }, + { + .name =3D "conf", + .type =3D QEMU_OPT_STRING, + }, + { + .name =3D "pool", + .type =3D QEMU_OPT_STRING, + }, + { + .name =3D "image", + .type =3D QEMU_OPT_STRING, + }, + { + .name =3D "snapshot", + .type =3D QEMU_OPT_STRING, + }, + { + /* you might be tempted to call this 'id' to match + * the ceph documentation, but then it'll get gobbled + * up in the block layer before it gets to the image driver */ + .name =3D "rbd-id", + .type =3D QEMU_OPT_STRING, + }, + { + .name =3D "keyvalue-pairs", + .type =3D QEMU_OPT_STRING, + }, + { /* end of list */ } + }, +}; + static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **e= rrp) { Error *local_err =3D NULL; @@ -500,25 +545,6 @@ static void qemu_rbd_complete_aio(RADOSCB *rcb) qemu_aio_unref(acb); } =20 -/* TODO Convert to fine grained options */ -static QemuOptsList runtime_opts =3D { - .name =3D "rbd", - .head =3D QTAILQ_HEAD_INITIALIZER(runtime_opts.head), - .desc =3D { - { - .name =3D "filename", - .type =3D QEMU_OPT_STRING, - .help =3D "Specification of the rbd image", - }, - { - .name =3D "password-secret", - .type =3D QEMU_OPT_STRING, - .help =3D "ID of secret providing the password", - }, - { /* end of list */ } - }, -}; - static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { --=20 2.9.3