mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-io: Support multiple -o in open command

Browse Source 
Instead of ignoring all option values but the last one, multiple -o
options now have the same meaning as having a single option with all
settings in the order of their respective -o options.

Same as commit 2dc8328 for qemu-img convert, except here we do it with
QemuOpts rather than QEMUOptionParameter.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2014-05-28 11:16:58 +02:00 committed by Kevin Wolf
parent b20e61e0d5
commit 443422fde7
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qemu-io.c
View File

@ -118,6 +118,7 @@ static const cmdinfo_t open_cmd = {
static QemuOptsList empty_opts = { static QemuOptsList empty_opts = {
.name = "drive", .name = "drive",
.merge_lists = true,
.head = QTAILQ_HEAD_INITIALIZER(empty_opts.head), .head = QTAILQ_HEAD_INITIALIZER(empty_opts.head),
.desc = { .desc = {
/* no elements => accept any params */ /* no elements => accept any params */
@ -132,7 +133,7 @@ static int open_f(BlockDriverState *bs, int argc, char **argv)
int growable = 0; int growable = 0;
int c; int c;
QemuOpts *qopts; QemuOpts *qopts;
QDict *opts = NULL; QDict *opts;
while ((c = getopt(argc, argv, "snrgo:")) != EOF) { while ((c = getopt(argc, argv, "snrgo:")) != EOF) {
switch (c) { switch (c) {
@ -149,15 +150,14 @@ static int open_f(BlockDriverState *bs, int argc, char **argv)
growable = 1; growable = 1;
break; break;
case 'o': case 'o':
qopts = qemu_opts_parse(&empty_opts, optarg, 0); if (!qemu_opts_parse(&empty_opts, optarg, 0)) {
if (qopts == NULL) {
printf("could not parse option list -- %s\n", optarg); printf("could not parse option list -- %s\n", optarg);
qemu_opts_reset(&empty_opts);
return 0; return 0;
} }
opts = qemu_opts_to_qdict(qopts, opts);
qemu_opts_del(qopts);
break; break;
default: default:
qemu_opts_reset(&empty_opts);
return qemuio_command_usage(&open_cmd); return qemuio_command_usage(&open_cmd);
} }
} }
@ -166,6 +166,10 @@ static int open_f(BlockDriverState *bs, int argc, char **argv)
flags |= BDRV_O_RDWR; flags |= BDRV_O_RDWR;
} }
qopts = qemu_opts_find(&empty_opts, NULL);
opts = qopts ? qemu_opts_to_qdict(qopts, NULL) : NULL;
qemu_opts_reset(&empty_opts);
if (optind == argc - 1) { if (optind == argc - 1) {
return openfile(argv[optind], flags, growable, opts); return openfile(argv[optind], flags, growable, opts);
} else if (optind == argc) { } else if (optind == argc) {