Re: [Qemu-devel] [PATCH 06/10] machine: Add machine_register_compat_props() function

[Marcel Apfelbaum <marcel@redhat.com>]

On 06/15/2016 11:32 PM, Eduardo Habkost wrote:
> Move the compat_props handling to core machine code.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>   hw/core/machine.c   | 16 ++++++++++++++++
>   include/hw/boards.h |  1 +
>   vl.c                |  9 ++-------
>   3 files changed, 19 insertions(+), 7 deletions(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index ccdd5fa..754a054 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -580,6 +580,22 @@ static void machine_class_finalize(ObjectClass *klass, void *data)
>       }
>   }
>
> +void machine_register_compat_props(MachineState *machine)
> +{
> +    MachineClass *mc = MACHINE_GET_CLASS(machine);
> +    int i;
> +    GlobalProperty *p;
> +
> +    if (!mc->compat_props) {
> +        return;
> +    }
> +
> +    for (i = 0; i < mc->compat_props->len; i++) {
> +        p = g_array_index(mc->compat_props, GlobalProperty *, i);
> +        qdev_prop_register_global(p);
> +    }
> +}
> +
>   static const TypeInfo machine_info = {
>       .name = TYPE_MACHINE,
>       .parent = TYPE_OBJECT,
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index d268bd0..ee71dc0 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -40,6 +40,7 @@ int machine_kvm_shadow_mem(MachineState *machine);
>   int machine_phandle_start(MachineState *machine);
>   bool machine_dump_guest_core(MachineState *machine);
>   bool machine_mem_merge(MachineState *machine);
> +void machine_register_compat_props(MachineState *machine);
>
>   /**
>    * CPUArchId:
> diff --git a/vl.c b/vl.c
> index d88ddba..86d53ca 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -4483,13 +4483,8 @@ int main(int argc, char **argv, char **envp)
>               exit (i == 1 ? 1 : 0);
>       }
>
> -    if (machine_class->compat_props) {
> -        GlobalProperty *p;
> -        for (i = 0; i < machine_class->compat_props->len; i++) {
> -            p = g_array_index(machine_class->compat_props, GlobalProperty *, i);
> -            qdev_prop_register_global(p);
> -        }
> -    }
> +    machine_register_compat_props(current_machine);
> +
>       qemu_opts_foreach(qemu_find_opts("global"),
>                         global_init_func, NULL, &err);
>       if (err) {
>

Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>

Thanks,
Marcel