From: David Gibson Date: Thu, 3 Dec 2015 06:34:20 +0000 (+1100) Subject: pseries: Remove redundant calls to spapr_machine_initfn() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=64f0f70a00ec62f10a1fd333a3a3a6bf513fc1a0;p=qemu.git pseries: Remove redundant calls to spapr_machine_initfn() 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 Reviewed-by: Thomas Huth Reviewed-by: Alexey Kardashevskiy --- diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c126e10fa4..c7c65179c6 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)