[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 06/16] pseries: Remove redundant calls to spapr_machine
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 06/16] pseries: Remove redundant calls to spapr_machine_initfn() |
Date: |
Mon, 11 Jan 2016 15:37:28 +1100 |
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>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Alexey Kardashevskiy <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)
--
2.5.0
- [Qemu-ppc] [PULL 10/16] pseries: DEFINE_SPAPR_MACHINE, (continued)
- [Qemu-ppc] [PULL 10/16] pseries: DEFINE_SPAPR_MACHINE, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 12/16] pseries: Improve setting of default machine version, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 15/16] spapr vio: fix to incomplete QOMify, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 04/16] pseries: Remove redundant setting of mc->name for pseries-2.5 machine, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 13/16] pseries: Add pseries-2.6 machine type, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 01/16] hw/ppc/spapr_rtc: Remove bad class_size value, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 02/16] target-ppc: Define kvmppc_read_int_dt(), David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 03/16] spapr: Add /system-id, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 07/16] pseries: Remove versions from mc->desc, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 08/16] Move SET_MACHINE_COMPAT macro to boards.h, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 06/16] pseries: Remove redundant calls to spapr_machine_initfn(),
David Gibson <=
- [Qemu-ppc] [PULL 11/16] pseries: Restructure class_options functions, David Gibson, 2016/01/10
- [Qemu-ppc] [PULL 05/16] pseries: Rearrange versioned machine type code, David Gibson, 2016/01/10
- Re: [Qemu-ppc] [PULL 00/16] ppc-for-2.6 queue 20160111, Peter Maydell, 2016/01/11