[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH v2 05/14] qemu-io: Support multiple -o in open comm
From: |
Markus Armbruster |
Subject: |
[Qemu-stable] [PATCH v2 05/14] qemu-io: Support multiple -o in open command |
Date: |
Wed, 28 May 2014 11:16:58 +0200 |
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 <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
---
qemu-io.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index 9fcd72b..ef3fef6 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -118,6 +118,7 @@ static const cmdinfo_t open_cmd = {
static QemuOptsList empty_opts = {
.name = "drive",
+ .merge_lists = true,
.head = QTAILQ_HEAD_INITIALIZER(empty_opts.head),
.desc = {
/* no elements => accept any params */
@@ -132,7 +133,7 @@ static int open_f(BlockDriverState *bs, int argc, char
**argv)
int growable = 0;
int c;
QemuOpts *qopts;
- QDict *opts = NULL;
+ QDict *opts;
while ((c = getopt(argc, argv, "snrgo:")) != EOF) {
switch (c) {
@@ -149,15 +150,14 @@ static int open_f(BlockDriverState *bs, int argc, char
**argv)
growable = 1;
break;
case 'o':
- qopts = qemu_opts_parse(&empty_opts, optarg, 0);
- if (qopts == NULL) {
+ if (!qemu_opts_parse(&empty_opts, optarg, 0)) {
printf("could not parse option list -- %s\n", optarg);
+ qemu_opts_reset(&empty_opts);
return 0;
}
- opts = qemu_opts_to_qdict(qopts, opts);
- qemu_opts_del(qopts);
break;
default:
+ qemu_opts_reset(&empty_opts);
return qemuio_command_usage(&open_cmd);
}
}
@@ -166,6 +166,10 @@ static int open_f(BlockDriverState *bs, int argc, char
**argv)
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) {
return openfile(argv[optind], flags, growable, opts);
} else if (optind == argc) {
--
1.9.3
- [Qemu-stable] [PATCH v2 00/14] block: Plug assorted memory leaks, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 02/14] block/vvfat: Plug memory leak in enable_write_target(), Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 04/14] block: Plug memory leak on brv_open_image() error path, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 01/14] qemu-img: Plug memory leak on block option help error path, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 13/14] block/sheepdog: Plug memory leak in sd_snapshot_create(), Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 12/14] block/vvfat: Plug memory leak in read_directory(), Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 10/14] block/qapi: Plug memory leak in dump_qobject() case QTYPE_QERROR, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 11/14] block/vvfat: Plug memory leak in check_directory_consistency(), Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 05/14] qemu-io: Support multiple -o in open command,
Markus Armbruster <=
- [Qemu-stable] [PATCH v2 14/14] qemu-img: Plug memory leak in convert command, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 08/14] blockdev: Plug memory leak in blockdev_init(), Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 07/14] qemu-io: Don't print NULL when open without non-option arg fails, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 09/14] blockdev: Plug memory leak in drive_init(), Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 06/14] qemu-io: Plug memory leak in open command, Markus Armbruster, 2014/05/28
- [Qemu-stable] [PATCH v2 03/14] qcow2: Plug memory leak on qcow2_invalidate_cache() error paths, Markus Armbruster, 2014/05/28
- Re: [Qemu-stable] [PATCH v2 00/14] block: Plug assorted memory leaks, Kevin Wolf, 2014/05/28