| Message ID | 1490621195-2228-6-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 27.03.2017 15:26, Markus Armbruster wrote: > The way we communicate extra key-value pairs from > qemu_rbd_parse_filename() to qemu_rbd_open() exposes option parameter > "keyvalue-pairs" on the command line. It's not wanted there. Hack: > rename the parameter to "=keyvalue-pairs" to make it inaccessible. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > Reviewed-by: Eric Blake <eblake@redhat.com> > --- > block/rbd.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) Reviewed-by: Max Reitz <mreitz@redhat.com> (Or you could just use x- like blkdebug does...) Max
Max Reitz <mreitz@redhat.com> writes: > On 27.03.2017 15:26, Markus Armbruster wrote: >> The way we communicate extra key-value pairs from >> qemu_rbd_parse_filename() to qemu_rbd_open() exposes option parameter >> "keyvalue-pairs" on the command line. It's not wanted there. Hack: >> rename the parameter to "=keyvalue-pairs" to make it inaccessible. >> >> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> Reviewed-by: Eric Blake <eblake@redhat.com> >> --- >> block/rbd.c | 12 ++++++++---- >> 1 file changed, 8 insertions(+), 4 deletions(-) > > Reviewed-by: Max Reitz <mreitz@redhat.com> Thanks! > (Or you could just use x- like blkdebug does...) Yes. An "x-" prefix tells you "don't use this", which you're free to ignore. The "=" prefix cannot be ignored, because the QemuOpts parser will choke on it. Matter of taste, I guess.
On Mon, Mar 27, 2017 at 03:26:29PM +0200, Markus Armbruster wrote: > The way we communicate extra key-value pairs from > qemu_rbd_parse_filename() to qemu_rbd_open() exposes option parameter > "keyvalue-pairs" on the command line. It's not wanted there. Hack: > rename the parameter to "=keyvalue-pairs" to make it inaccessible. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Jeff Cody <jcody@redhat.com> > --- > block/rbd.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/block/rbd.c b/block/rbd.c > index 182a5a3..2632533 100644 > --- a/block/rbd.c > +++ b/block/rbd.c > @@ -215,7 +215,7 @@ static void qemu_rbd_parse_filename(const char *filename, QDict *options, > } > > if (keypairs[0]) { > - qdict_put(options, "keyvalue-pairs", qstring_from_str(keypairs)); > + qdict_put(options, "=keyvalue-pairs", qstring_from_str(keypairs)); > } > > > @@ -330,7 +330,11 @@ static QemuOptsList runtime_opts = { > .help = "Rados id name", > }, > { > - .name = "keyvalue-pairs", > + /* > + * HACK: name starts with '=' so that qemu_opts_parse() > + * can't set it > + */ > + .name = "=keyvalue-pairs", > .type = QEMU_OPT_STRING, > .help = "Legacy rados key/value option parameters", > }, > @@ -405,7 +409,7 @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp) > conf = qemu_opt_get(rbd_opts, "conf"); > clientname = qemu_opt_get(rbd_opts, "user"); > name = qemu_opt_get(rbd_opts, "image"); > - keypairs = qemu_opt_get(rbd_opts, "keyvalue-pairs"); > + keypairs = qemu_opt_get(rbd_opts, "=keyvalue-pairs"); > > ret = rados_create(&cluster, clientname); > if (ret < 0) { > @@ -638,7 +642,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, > snap = qemu_opt_get(opts, "snapshot"); > clientname = qemu_opt_get(opts, "user"); > name = qemu_opt_get(opts, "image"); > - keypairs = qemu_opt_get(opts, "keyvalue-pairs"); > + keypairs = qemu_opt_get(opts, "=keyvalue-pairs"); > > if (!pool || !name) { > error_setg(errp, "Parameters 'pool' and 'image' are required"); > -- > 2.7.4 >
diff --git a/block/rbd.c b/block/rbd.c index 182a5a3..2632533 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -215,7 +215,7 @@ static void qemu_rbd_parse_filename(const char *filename, QDict *options, } if (keypairs[0]) { - qdict_put(options, "keyvalue-pairs", qstring_from_str(keypairs)); + qdict_put(options, "=keyvalue-pairs", qstring_from_str(keypairs)); } @@ -330,7 +330,11 @@ static QemuOptsList runtime_opts = { .help = "Rados id name", }, { - .name = "keyvalue-pairs", + /* + * HACK: name starts with '=' so that qemu_opts_parse() + * can't set it + */ + .name = "=keyvalue-pairs", .type = QEMU_OPT_STRING, .help = "Legacy rados key/value option parameters", }, @@ -405,7 +409,7 @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp) conf = qemu_opt_get(rbd_opts, "conf"); clientname = qemu_opt_get(rbd_opts, "user"); name = qemu_opt_get(rbd_opts, "image"); - keypairs = qemu_opt_get(rbd_opts, "keyvalue-pairs"); + keypairs = qemu_opt_get(rbd_opts, "=keyvalue-pairs"); ret = rados_create(&cluster, clientname); if (ret < 0) { @@ -638,7 +642,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, snap = qemu_opt_get(opts, "snapshot"); clientname = qemu_opt_get(opts, "user"); name = qemu_opt_get(opts, "image"); - keypairs = qemu_opt_get(opts, "keyvalue-pairs"); + keypairs = qemu_opt_get(opts, "=keyvalue-pairs"); if (!pool || !name) { error_setg(errp, "Parameters 'pool' and 'image' are required");