[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/58] a15mpcore: Split off instance_init
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 30/58] a15mpcore: Split off instance_init |
Date: |
Tue, 8 Oct 2013 19:44:28 +0200 |
From: Andreas Färber <address@hidden>
Prepares for QOM realize.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/cpu/a15mpcore.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index 9abba67..af29c35 100644
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
@@ -44,6 +44,15 @@ static void a15mp_priv_set_irq(void *opaque, int irq, int
level)
qemu_set_irq(qdev_get_gpio_in(s->gic, irq), level);
}
+static void a15mp_priv_initfn(Object *obj)
+{
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
+ A15MPPrivState *s = A15MPCORE_PRIV(obj);
+
+ memory_region_init(&s->container, obj, "a15mp-priv-container", 0x8000);
+ sysbus_init_mmio(sbd, &s->container);
+}
+
static int a15mp_priv_init(SysBusDevice *dev)
{
A15MPPrivState *s = A15MPCORE_PRIV(dev);
@@ -92,14 +101,11 @@ static int a15mp_priv_init(SysBusDevice *dev)
* 0x5000-0x5fff -- GIC virtual interface control (not modelled)
* 0x6000-0x7fff -- GIC virtual CPU interface (not modelled)
*/
- memory_region_init(&s->container, OBJECT(s),
- "a15mp-priv-container", 0x8000);
memory_region_add_subregion(&s->container, 0x1000,
sysbus_mmio_get_region(busdev, 0));
memory_region_add_subregion(&s->container, 0x2000,
sysbus_mmio_get_region(busdev, 1));
- sysbus_init_mmio(dev, &s->container);
return 0;
}
@@ -128,6 +134,7 @@ static const TypeInfo a15mp_priv_info = {
.name = TYPE_A15MPCORE_PRIV,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(A15MPPrivState),
+ .instance_init = a15mp_priv_initfn,
.class_init = a15mp_priv_class_init,
};
--
1.8.1.4
- [Qemu-devel] [PULL 14/58] an5206: Don't enforce use of kernel for qtest, (continued)
- [Qemu-devel] [PULL 14/58] an5206: Don't enforce use of kernel for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 22/58] arm_gic: Extract headers hw/intc/arm_gic{, _common}.h, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 53/58] qom: Add pointer to int property helpers, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 52/58] qom: Clean up struct Error references, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 01/58] hw/arm/boot: Make user not specifying a kernel not an error, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 29/58] a9mpcore: Prepare for QOM embedding, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 28/58] a9mpcore: Convert to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 54/58] pxa: Fix typo "dettach", Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 02/58] hw/arm: Tidy up conditional calls to arm_load_kernel(), Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 24/58] a9scu: QOM cleanups, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 30/58] a15mpcore: Split off instance_init,
Andreas Färber <=
- [Qemu-devel] [PULL 41/58] realview_gic: Prepare for QOM embedding, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 16/58] shix: Drop debug output, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 39/58] arm11mpcore: Convert ARM11MPCorePriveState to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 15/58] milkymist: Suppress -kernel/-bios/-drive error for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 06/58] gumstix: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 05/58] mainstone: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 55/58] pcmcia: QOM'ify PCMCIACardState and MicroDriveState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 46/58] qdev-monitor: Fix crash when device_add is called with abstract driver, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 32/58] a15mpcore: Convert to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 23/58] a9mpcore: Embed GICState, Andreas Färber, 2013/10/08