diff options
| author | Andreas Färber <andreas.faerber@web.de> | 2013-06-30 19:22:12 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-11-05 17:47:29 +0100 |
| commit | 9eb39db520cea30620b24098b6d731f78cc819a0 (patch) | |
| tree | 7a1faeba90bdb02812302ac46b0380edff9a17de /hw/misc | |
| parent | 9b5f952bb8015b079783a9197f3331085075fbc4 (diff) | |
| download | qemu-9eb39db520cea30620b24098b6d731f78cc819a0.zip qemu-9eb39db520cea30620b24098b6d731f78cc819a0.tar.gz qemu-9eb39db520cea30620b24098b6d731f78cc819a0.tar.bz2 | |
a9scu: QOM cleanups
Rename A9SCUState::busdev field to parent_obj and turn realizefn into an
instance_init function to allow early MMIO mapping.
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Diffstat (limited to 'hw/misc')
| -rw-r--r-- | hw/misc/a9scu.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c index 601b573..2661014 100644 --- a/hw/misc/a9scu.c +++ b/hw/misc/a9scu.c @@ -13,7 +13,10 @@ /* A9MP private memory region. */ typedef struct A9SCUState { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; uint32_t control; uint32_t status; @@ -114,12 +117,12 @@ static void a9_scu_reset(DeviceState *dev) s->control = 0; } -static void a9_scu_realize(DeviceState *dev, Error ** errp) +static void a9_scu_init(Object *obj) { - A9SCUState *s = A9_SCU(dev); - SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + A9SCUState *s = A9_SCU(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); - memory_region_init_io(&s->iomem, OBJECT(dev), &a9_scu_ops, s, + memory_region_init_io(&s->iomem, obj, &a9_scu_ops, s, "a9-scu", 0x100); sysbus_init_mmio(sbd, &s->iomem); } @@ -144,7 +147,6 @@ static void a9_scu_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - dc->realize = a9_scu_realize; dc->props = a9_scu_properties; dc->vmsd = &vmstate_a9_scu; dc->reset = a9_scu_reset; @@ -154,6 +156,7 @@ static const TypeInfo a9_scu_info = { .name = TYPE_A9_SCU, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(A9SCUState), + .instance_init = a9_scu_init, .class_init = a9_scu_class_init, }; |