From 867469aa337ac206ee6f4ea1b5c4c0f1ec36696d Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Tue, 25 Feb 2014 15:00:03 +0100 Subject: [PATCH 5/7] qemu-img amend: Support multiple -o options RH-Author: Kevin Wolf Message-id: <1393340405-9936-5-git-send-email-kwolf@redhat.com> Patchwork-id: 57794 O-Subject: [RHEL-7.0 qemu-kvm PATCH 4/6] qemu-img amend: Support multiple -o options Bugzilla: 1065873 RH-Acked-by: Juan Quintela RH-Acked-by: Fam Zheng RH-Acked-by: Miroslav Rezanina 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 Reviewed-by: Jeff Cody Reviewed-by: Eric Blake (cherry picked from commit 626f84f39d4ae365a44dbbc0d0dd3c7739c3971a) Signed-off-by: Kevin Wolf --- qemu-img.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) Signed-off-by: Miroslav Rezanina --- qemu-img.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index e7b12c2..5002a56 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2617,7 +2617,18 @@ static int img_amend(int argc, char **argv) help(); break; 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; case 'f': fmt = optarg; @@ -2647,7 +2658,7 @@ static int img_amend(int argc, char **argv) fmt = bs->drv->format_name; - if (is_help_option(options)) { + if (has_help_option(options)) { ret = print_block_option_help(filename, fmt); goto out; } @@ -2674,6 +2685,8 @@ out: } free_option_parameters(create_options); free_option_parameters(options_param); + g_free(options); + if (ret) { return 1; } -- 1.7.1