[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 4/6] qemu-img amend: Support multiple -o opti
From: |
Jeff Cody |
Subject: |
Re: [Qemu-devel] [PATCH v2 4/6] qemu-img amend: Support multiple -o options |
Date: |
Thu, 20 Feb 2014 14:39:02 -0500 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Thu, Feb 20, 2014 at 03:57:21PM +0100, Kevin Wolf wrote:
> 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 <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
> ---
> qemu-img.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/qemu-img.c b/qemu-img.c
> index ba6e82d..d6dc7ec 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -2658,7 +2658,13 @@ static int img_amend(int argc, char **argv)
> help();
> break;
> case 'o':
> - options = optarg;
> + 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;
> @@ -2688,7 +2694,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;
> }
> @@ -2715,6 +2721,8 @@ out:
> }
> free_option_parameters(create_options);
> free_option_parameters(options_param);
> + g_free(options);
> +
> if (ret) {
> return 1;
> }
> --
> 1.8.1.4
>
>
- [Qemu-devel] [PATCH v2 2/6] qemu-img create: Support multiple -o options, (continued)
- [Qemu-devel] [PATCH v2 2/6] qemu-img create: Support multiple -o options, Kevin Wolf, 2014/02/20
- [Qemu-devel] [PATCH v2 3/6] qemu-img convert: Support multiple -o options, Kevin Wolf, 2014/02/20
- [Qemu-devel] [PATCH v2 4/6] qemu-img amend: Support multiple -o options, Kevin Wolf, 2014/02/20
- [Qemu-devel] [PATCH v2 6/6] qemu-iotests: Check qemu-img command line parsing, Kevin Wolf, 2014/02/20
- [Qemu-devel] [PATCH v2 5/6] qemu-img: Allow -o help with incomplete argument list, Kevin Wolf, 2014/02/20