Re: [Qemu-devel] [PATCH v2] vl: Simplify global property registration

[Igor Mammedov]

On Thu, 28 Jan 2016 13:11:04 -0200
Eduardo Habkost <address@hidden> wrote:

> There's no need to use qdev_prop_register_global_list() and an
> array, if we are registering a single GlobalProperty struct. Use
> qdev_prop_register_global() instead.
> 
> Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>

> ---
>  vl.c | 39 +++++++++++++++------------------------
>  1 file changed, 15 insertions(+), 24 deletions(-)
> 
> diff --git a/vl.c b/vl.c
> index f043009..368e50c 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -878,16 +878,13 @@ static void configure_rtc(QemuOpts *opts)
>      value = qemu_opt_get(opts, "driftfix");
>      if (value) {
>          if (!strcmp(value, "slew")) {
> -            static GlobalProperty slew_lost_ticks[] = {
> -                {
> -                    .driver   = "mc146818rtc",
> -                    .property = "lost_tick_policy",
> -                    .value    = "slew",
> -                },
> -                { /* end of list */ }
> +            static GlobalProperty slew_lost_ticks = {
> +                .driver   = "mc146818rtc",
> +                .property = "lost_tick_policy",
> +                .value    = "slew",
>              };
>  
> -            qdev_prop_register_global_list(slew_lost_ticks);
> +            qdev_prop_register_global(&slew_lost_ticks);
>          } else if (!strcmp(value, "none")) {
>              /* discard is default */
>          } else {
> @@ -3630,16 +3627,13 @@ int main(int argc, char **argv, char **envp)
>                  win2k_install_hack = 1;
>                  break;
>              case QEMU_OPTION_rtc_td_hack: {
> -                static GlobalProperty slew_lost_ticks[] = {
> -                    {
> -                        .driver   = "mc146818rtc",
> -                        .property = "lost_tick_policy",
> -                        .value    = "slew",
> -                    },
> -                    { /* end of list */ }
> +                static GlobalProperty slew_lost_ticks = {
> +                    .driver   = "mc146818rtc",
> +                    .property = "lost_tick_policy",
> +                    .value    = "slew",
>                  };
>  
> -                qdev_prop_register_global_list(slew_lost_ticks);
> +                qdev_prop_register_global(&slew_lost_ticks);
>                  break;
>              }
>              case QEMU_OPTION_acpitable:
> @@ -3686,18 +3680,15 @@ int main(int argc, char **argv, char **envp)
>                  break;
>              }
>              case QEMU_OPTION_no_kvm_pit_reinjection: {
> -                static GlobalProperty kvm_pit_lost_tick_policy[] = {
> -                    {
> -                        .driver   = "kvm-pit",
> -                        .property = "lost_tick_policy",
> -                        .value    = "discard",
> -                    },
> -                    { /* end of list */ }
> +                static GlobalProperty kvm_pit_lost_tick_policy = {
> +                    .driver   = "kvm-pit",
> +                    .property = "lost_tick_policy",
> +                    .value    = "discard",
>                  };
>  
>                  error_report("warning: deprecated, replaced by "
>                               "-global kvm-pit.lost_tick_policy=discard");
> -                qdev_prop_register_global_list(kvm_pit_lost_tick_policy);
> +                qdev_prop_register_global(&kvm_pit_lost_tick_policy);
>                  break;
>              }
>              case QEMU_OPTION_usb: