From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciHcE-00041U-1K for qemu-devel@nongnu.org; Mon, 27 Feb 2017 04:29:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciHcD-0005qJ-2O for qemu-devel@nongnu.org; Mon, 27 Feb 2017 04:29:10 -0500 Date: Mon, 27 Feb 2017 09:28:56 +0000 From: "Daniel P. Berrange" Message-ID: <20170227092856.GC18219@redhat.com> Reply-To: "Daniel P. Berrange" References: <6f1d60bdbbb4e82991c699d4aa6666c4317a1c5d.1488180142.git.jcody@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <6f1d60bdbbb4e82991c699d4aa6666c4317a1c5d.1488180142.git.jcody@redhat.com> Subject: Re: [Qemu-devel] [PATCH 2/4] block/rbd: code movement List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jeff Cody Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, armbru@redhat.com, eblake@redhat.com Describing this as "code movement" when the added & removed chunks are not identical is a bit misleading. Can you expand the commit message to explain why the extra options are being added On Mon, Feb 27, 2017 at 02:30:39AM -0500, Jeff Cody wrote: > 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) > } > } > > +static QemuOptsList runtime_opts = { > + .name = "rbd", > + .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head), > + .desc = { > + { > + .name = "filename", > + .type = QEMU_OPT_STRING, > + .help = "Specification of the rbd image", > + }, > + { > + .name = "password-secret", > + .type = QEMU_OPT_STRING, > + .help = "ID of secret providing the password", > + }, > + { > + .name = "conf", > + .type = QEMU_OPT_STRING, > + }, > + { > + .name = "pool", > + .type = QEMU_OPT_STRING, > + }, > + { > + .name = "image", > + .type = QEMU_OPT_STRING, > + }, > + { > + .name = "snapshot", > + .type = 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 = "rbd-id", > + .type = QEMU_OPT_STRING, > + }, > + { > + .name = "keyvalue-pairs", > + .type = QEMU_OPT_STRING, > + }, > + { /* end of list */ } > + }, > +}; > + > static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp) > { > Error *local_err = NULL; > @@ -500,25 +545,6 @@ static void qemu_rbd_complete_aio(RADOSCB *rcb) > qemu_aio_unref(acb); > } > > -/* TODO Convert to fine grained options */ > -static QemuOptsList runtime_opts = { > - .name = "rbd", > - .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head), > - .desc = { > - { > - .name = "filename", > - .type = QEMU_OPT_STRING, > - .help = "Specification of the rbd image", > - }, > - { > - .name = "password-secret", > - .type = QEMU_OPT_STRING, > - .help = "ID of secret providing the password", > - }, > - { /* end of list */ } > - }, > -}; > - > static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, > Error **errp) > { > -- > 2.9.3 > Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|