Re: [Qemu-ppc] [Qemu-devel] [PATCHv2 03/10] pseries: Remove redundant calls to spapr_machine_initfn()

[Thomas Huth]

On 07/12/15 04:34, David Gibson wrote:
> The instance_init() functions for several of the pseries-x.y versioned
> machine types explicitly call spapr_machine_initfn().  But that's the
> instance_init function for the common parent of all those machine types,
> so will already have been called beforehand by the QOM infrastructure.
> 
> Remove the redundant calls.
> 
> Signed-off-by: David Gibson <address@hidden>
> ---
>  hw/ppc/spapr.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index c126e10..c7c6517 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2366,7 +2366,6 @@ static void spapr_compat_2_3(Object *obj)
>  static void spapr_machine_2_3_instance_init(Object *obj)
>  {
>      spapr_compat_2_3(obj);
> -    spapr_machine_initfn(obj);
>  }
>  
>  static void spapr_machine_2_3_class_init(ObjectClass *oc, void *data)
> @@ -2409,7 +2408,6 @@ static void spapr_compat_2_2(Object *obj)
>  static void spapr_machine_2_2_instance_init(Object *obj)
>  {
>      spapr_compat_2_2(obj);
> -    spapr_machine_initfn(obj);
>  }
>  
>  static void spapr_machine_2_2_class_init(ObjectClass *oc, void *data)
> @@ -2446,7 +2444,6 @@ static void spapr_compat_2_1(Object *obj)
>  static void spapr_machine_2_1_instance_init(Object *obj)
>  {
>      spapr_compat_2_1(obj);
> -    spapr_machine_initfn(obj);
>  }
>  
>  static void spapr_machine_2_1_class_init(ObjectClass *oc, void *data)

Right, I just checked, and without this patch, spapr_machine_initfn() is
indeed called twice.

Reviewed-by: Thomas Huth <address@hidden>