Commit 16714b16 authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

vl: Simplify global property registration 



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.

Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 1f0dfe02

vl.c

+15 −24
Original line number Diff line number Diff line
@@ -888,16 +888,13 @@ static void configure_rtc(QemuOpts *opts) 
    value = qemu_opt_get(opts, "driftfix");

    if (value) {

        if (!strcmp(value, "slew")) {

            static GlobalProperty slew_lost_ticks[] = {

                {

            static GlobalProperty slew_lost_ticks = {

                .driver   = "mc146818rtc",

                .property = "lost_tick_policy",

                .value    = "slew",

                },

                { /* end of list */ }

            };



            qdev_prop_register_global_list(slew_lost_ticks);

            qdev_prop_register_global(&slew_lost_ticks);

        } else if (!strcmp(value, "none")) {

            /* discard is default */

        } else {
@@ -3626,16 +3623,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[] = {

                    {

                static GlobalProperty slew_lost_ticks = {

                    .driver   = "mc146818rtc",

                    .property = "lost_tick_policy",

                    .value    = "slew",

                    },

                    { /* end of list */ }

                };



                qdev_prop_register_global_list(slew_lost_ticks);

                qdev_prop_register_global(&slew_lost_ticks);

                break;

            }

            case QEMU_OPTION_acpitable:
@@ -3682,18 +3676,15 @@ int main(int argc, char **argv, char **envp) 
                break;

            }

            case QEMU_OPTION_no_kvm_pit_reinjection: {

                static GlobalProperty kvm_pit_lost_tick_policy[] = {

                    {

                static GlobalProperty kvm_pit_lost_tick_policy = {

                    .driver   = "kvm-pit",

                    .property = "lost_tick_policy",

                    .value    = "discard",

                    },

                    { /* end of list */ }

                };



                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: