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 <david@gibson.dropbear.id.au>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
This commit is contained in:
David Gibson 2015-12-03 17:34:20 +11:00
parent 1c5f29bbc8
commit 64f0f70a00

View File

@ -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)