[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 06/35] ppc/xics: move the instance_init handler under t
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 06/35] ppc/xics: move the instance_init handler under the ics-base class |
Date: |
Tue, 3 Jul 2018 15:57:35 +1000 |
From: Cédric Le Goater <address@hidden>
Signed-off-by: Cédric Le Goater <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/intc/xics.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index d6066d561f..83340770f7 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -611,13 +611,6 @@ static const VMStateDescription vmstate_ics_simple = {
},
};
-static void ics_simple_initfn(Object *obj)
-{
- ICSState *ics = ICS_SIMPLE(obj);
-
- ics->offset = XICS_IRQ_BASE;
-}
-
static void ics_simple_realize(DeviceState *dev, Error **errp)
{
ICSState *ics = ICS_SIMPLE(dev);
@@ -655,7 +648,6 @@ static const TypeInfo ics_simple_info = {
.instance_size = sizeof(ICSState),
.class_init = ics_simple_class_init,
.class_size = sizeof(ICSStateClass),
- .instance_init = ics_simple_initfn,
};
static void ics_base_realize(DeviceState *dev, Error **errp)
@@ -679,6 +671,13 @@ static void ics_base_realize(DeviceState *dev, Error
**errp)
ics->irqs = g_malloc0(ics->nr_irqs * sizeof(ICSIRQState));
}
+static void ics_base_instance_init(Object *obj)
+{
+ ICSState *ics = ICS_BASE(obj);
+
+ ics->offset = XICS_IRQ_BASE;
+}
+
static Property ics_base_properties[] = {
DEFINE_PROP_UINT32("nr-irqs", ICSState, nr_irqs, 0),
DEFINE_PROP_END_OF_LIST(),
@@ -697,6 +696,7 @@ static const TypeInfo ics_base_info = {
.parent = TYPE_DEVICE,
.abstract = true,
.instance_size = sizeof(ICSState),
+ .instance_init = ics_base_instance_init,
.class_init = ics_base_class_init,
.class_size = sizeof(ICSStateClass),
};
--
2.17.1
- [Qemu-ppc] [PULL 00/35] ppc-for-3.0 queue 20180703, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 01/35] mac_dbdma: only dump commands for debug enabled channels, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 03/35] sam460ex: Fix sam460ex device tree when booting the Linux kernel, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 10/35] ppc/pnv: fix pnv_core_realize() error handling, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 02/35] mac_newworld: always enable disable_direct_reg3_writes for ADB machines, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 06/35] ppc/xics: move the instance_init handler under the ics-base class,
David Gibson <=
- [Qemu-ppc] [PULL 11/35] target/ppc: Add do_unaligned_access hook, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 07/35] ppx/xics: introduce a parent_reset in ICSStateClass, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 20/35] target/ppc: Use MO_ALIGN for EXIWX and ECOWX, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 16/35] target/ppc: Tidy gen_conditional_store, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 09/35] ppc/xics: rework the ICS classes inheritance tree, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 19/35] target/ppc: Split out gen_st_atomic, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 22/35] target/ppc: Implement the rest of gen_ld_atomic, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 27/35] hw/timer: Add basic M41T80 emulation, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 33/35] target/ppc: set is_jmp on ppc_tr_breakpoint_check, David Gibson, 2018/07/03
- [Qemu-ppc] [PULL 28/35] sam460ex: Add RTC device, David Gibson, 2018/07/03