Re: [Qemu-devel] [PATCH v2 1/2] block: Specify -drive legacy option aliases in array

["Benoît Canet" <benoit.canet@irqsave.net>]

The Wednesday 24 Sep 2014 à 16:46:28 (+0200), Kevin Wolf wrote :
> Instead of a series of qemu_opt_rename() calls, use an array that
> contains all of the renames and call qemu_opt_rename() in a loop. This
> will keep the code readable even when we add an error return to
> qemu_opt_rename().
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  blockdev.c | 39 ++++++++++++++++++++++++---------------
>  1 file changed, 24 insertions(+), 15 deletions(-)
> 
> diff --git a/blockdev.c b/blockdev.c
> index a194d04..6a33fd2 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -641,28 +641,37 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
>      const char *serial;
>      const char *filename;
>      Error *local_err = NULL;
> +    int i;
>  
>      /* Change legacy command line options into QMP ones */
> -    qemu_opt_rename(all_opts, "iops", "throttling.iops-total");
> -    qemu_opt_rename(all_opts, "iops_rd", "throttling.iops-read");
> -    qemu_opt_rename(all_opts, "iops_wr", "throttling.iops-write");
> +    static const struct {
> +        const char *from;
> +        const char *to;
> +    } opt_renames[] = {
> +        { "iops",           "throttling.iops-total" },
> +        { "iops_rd",        "throttling.iops-read" },
> +        { "iops_wr",        "throttling.iops-write" },
>  
> -    qemu_opt_rename(all_opts, "bps", "throttling.bps-total");
> -    qemu_opt_rename(all_opts, "bps_rd", "throttling.bps-read");
> -    qemu_opt_rename(all_opts, "bps_wr", "throttling.bps-write");
> +        { "bps",            "throttling.bps-total" },
> +        { "bps_rd",         "throttling.bps-read" },
> +        { "bps_wr",         "throttling.bps-write" },
>  
> -    qemu_opt_rename(all_opts, "iops_max", "throttling.iops-total-max");
> -    qemu_opt_rename(all_opts, "iops_rd_max", "throttling.iops-read-max");
> -    qemu_opt_rename(all_opts, "iops_wr_max", "throttling.iops-write-max");
> +        { "iops_max",       "throttling.iops-total-max" },
> +        { "iops_rd_max",    "throttling.iops-read-max" },
> +        { "iops_wr_max",    "throttling.iops-write-max" },
>  
> -    qemu_opt_rename(all_opts, "bps_max", "throttling.bps-total-max");
> -    qemu_opt_rename(all_opts, "bps_rd_max", "throttling.bps-read-max");
> -    qemu_opt_rename(all_opts, "bps_wr_max", "throttling.bps-write-max");
> +        { "bps_max",        "throttling.bps-total-max" },
> +        { "bps_rd_max",     "throttling.bps-read-max" },
> +        { "bps_wr_max",     "throttling.bps-write-max" },
>  
> -    qemu_opt_rename(all_opts,
> -                    "iops_size", "throttling.iops-size");
> +        { "iops_size",      "throttling.iops-size" },
>  
> -    qemu_opt_rename(all_opts, "readonly", "read-only");
> +        { "readonly",       "read-only" },
> +    };
> +
> +    for (i = 0; i < ARRAY_SIZE(opt_renames); i++) {
> +        qemu_opt_rename(all_opts, opt_renames[i].from, opt_renames[i].to);
> +    }
>  
>      value = qemu_opt_get(all_opts, "cache");
>      if (value) {
> -- 
> 1.8.3.1
> 
> 

Reviewed-by: Benoît Canet <benoit.canet@nodalink.com>