diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-03-28 10:56:03 +0200 |
|---|---|---|
| committer | Jeff Cody <jcody@redhat.com> | 2017-03-28 09:53:16 -0400 |
| commit | 82f20e8547ce665e9bb23fdb55374840b846c143 (patch) | |
| tree | b47abd57f06bbb367e182d86af640e807ad16b22 | |
| parent | 8efb339dd47b164429e9a57f36ac5c3dd810a4ce (diff) | |
| download | qemu-82f20e8547ce665e9bb23fdb55374840b846c143.zip qemu-82f20e8547ce665e9bb23fdb55374840b846c143.tar.gz qemu-82f20e8547ce665e9bb23fdb55374840b846c143.tar.bz2 | |
rbd: Don't accept -drive driver=rbd, keyvalue-pairs=...
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>
| -rw-r--r-- | block/rbd.c | 12 |
1 files 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"); |