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

qemu-img create: Support multiple -o options

Browse Source 
If you specified multiple -o options for qemu-img create, it would
silently ignore all but the last one. This patch fixes the problem.

Now multiple -o options has the same meaning as having a single option
with all settings in the order of their respective -o options.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2014-02-21 16:24:04 +01:00
parent 7cc07ab8da
commit 77386bf6eb
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
qemu-img.c
View File

@ -369,13 +369,23 @@ static int img_create(int argc, char **argv)
case 'e': case 'e':
error_report("option -e is deprecated, please use \'-o " error_report("option -e is deprecated, please use \'-o "
"encryption\' instead!"); "encryption\' instead!");
return 1; goto fail;
case '6': case '6':
error_report("option -6 is deprecated, please use \'-o " error_report("option -6 is deprecated, please use \'-o "
"compat6\' instead!"); "compat6\' instead!");
return 1; goto fail;
case 'o': case 'o':
options = optarg; if (!is_valid_option_list(optarg)) {
error_report("Invalid option list: %s", optarg);
goto fail;
}
if (!options) {
options = g_strdup(optarg);
} else {
char *old_options = options;
options = g_strdup_printf("%s,%s", options, optarg);
g_free(old_options);
}
break; break;
case 'q': case 'q':
quiet = true; quiet = true;
@ -403,7 +413,7 @@ static int img_create(int argc, char **argv)
error_report("kilobytes, megabytes, gigabytes, terabytes, " error_report("kilobytes, megabytes, gigabytes, terabytes, "
"petabytes and exabytes."); "petabytes and exabytes.");
} }
return 1; goto fail;
} }
img_size = (uint64_t)sval; img_size = (uint64_t)sval;
} }
@ -411,7 +421,8 @@ static int img_create(int argc, char **argv)
help(); help();
} }
if (options && is_help_option(options)) { if (options && has_help_option(options)) {
g_free(options);
return print_block_option_help(filename, fmt); return print_block_option_help(filename, fmt);
} }
@ -420,10 +431,15 @@ static int img_create(int argc, char **argv)
if (local_err) { if (local_err) {
error_report("%s: %s", filename, error_get_pretty(local_err)); error_report("%s: %s", filename, error_get_pretty(local_err));
error_free(local_err); error_free(local_err);
return 1; goto fail;
} }
g_free(options);
return 0; return 0;
fail:
g_free(options);
return 1;
} }
static void dump_json_image_check(ImageCheck *check, bool quiet) static void dump_json_image_check(ImageCheck *check, bool quiet)