david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rbd: Don't accept -drive driver=rbd, keyvalue-pairs=...

Browse Source 
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: Max Reitz <mreitz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 1490691368-32099-6-git-send-email-armbru@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
This commit is contained in:
Markus Armbruster 2017-03-28 10:56:03 +02:00 committed by Jeff Cody
parent 8efb339dd4
commit 82f20e8547
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/rbd.c
View File

@ -215,7 +215,7 @@ static void qemu_rbd_parse_filename(const char *filename, QDict *options,
} }
if (keypairs[0]) { 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", .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, .type = QEMU_OPT_STRING,
.help = "Legacy rados key/value option parameters", .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"); conf = qemu_opt_get(rbd_opts, "conf");
clientname = qemu_opt_get(rbd_opts, "user"); clientname = qemu_opt_get(rbd_opts, "user");
name = qemu_opt_get(rbd_opts, "image"); 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); ret = rados_create(&cluster, clientname);
if (ret < 0) { if (ret < 0) {
@ -638,7 +642,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
snap = qemu_opt_get(opts, "snapshot"); snap = qemu_opt_get(opts, "snapshot");
clientname = qemu_opt_get(opts, "user"); clientname = qemu_opt_get(opts, "user");
name = qemu_opt_get(opts, "image"); name = qemu_opt_get(opts, "image");
keypairs = qemu_opt_get(opts, "keyvalue-pairs"); keypairs = qemu_opt_get(opts, "=keyvalue-pairs");
if (!pool || !name) { if (!pool || !name) {
error_setg(errp, "Parameters 'pool' and 'image' are required"); error_setg(errp, "Parameters 'pool' and 'image' are required");