OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-img convert: Support multiple -o options

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.

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:05 +01:00
parent 77386bf6eb
commit 2dc8328b4c
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
qemu-img.c
View File

@ -1164,6 +1164,9 @@ static int img_convert(int argc, char **argv)
Error *local_err = NULL; Error *local_err = NULL;
QemuOpts *sn_opts = NULL; QemuOpts *sn_opts = NULL;
/* Initialize before goto out */
qemu_progress_init(progress, 1.0);
fmt = NULL; fmt = NULL;
out_fmt = "raw"; out_fmt = "raw";
cache = "unsafe"; cache = "unsafe";
@ -1195,13 +1198,26 @@ static int img_convert(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; ret = -1;
goto out;
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; ret = -1;
goto out;
case 'o': case 'o':
options = optarg; if (!is_valid_option_list(optarg)) {
error_report("Invalid option list: %s", optarg);
ret = -1;
goto out;
}
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 's': case 's':
snapshot_name = optarg; snapshot_name = optarg;
@ -1212,7 +1228,8 @@ static int img_convert(int argc, char **argv)
if (!sn_opts) { if (!sn_opts) {
error_report("Failed in parsing snapshot param '%s'", error_report("Failed in parsing snapshot param '%s'",
optarg); optarg);
return 1; ret = -1;
goto out;
} }
} else { } else {
snapshot_name = optarg; snapshot_name = optarg;
@ -1225,7 +1242,8 @@ static int img_convert(int argc, char **argv)
sval = strtosz_suffix(optarg, &end, STRTOSZ_DEFSUFFIX_B); sval = strtosz_suffix(optarg, &end, STRTOSZ_DEFSUFFIX_B);
if (sval < 0 || *end) { if (sval < 0 || *end) {
error_report("Invalid minimum zero buffer size for sparse output specified"); error_report("Invalid minimum zero buffer size for sparse output specified");
return 1; ret = -1;
goto out;
} }
min_sparse = sval / BDRV_SECTOR_SIZE; min_sparse = sval / BDRV_SECTOR_SIZE;
@ -1257,10 +1275,7 @@ static int img_convert(int argc, char **argv)
out_filename = argv[argc - 1]; out_filename = argv[argc - 1];
/* Initialize before goto out */ if (options && has_help_option(options)) {
qemu_progress_init(progress, 1.0);
if (options && is_help_option(options)) {
ret = print_block_option_help(out_filename, out_fmt); ret = print_block_option_help(out_filename, out_fmt);
goto out; goto out;
} }
@ -1653,6 +1668,7 @@ out:
free_option_parameters(create_options); free_option_parameters(create_options);
free_option_parameters(param); free_option_parameters(param);
qemu_vfree(buf); qemu_vfree(buf);
g_free(options);
if (sn_opts) { if (sn_opts) {
qemu_opts_del(sn_opts); qemu_opts_del(sn_opts);
} }