SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a9scu: QOM cleanups

Browse Source 
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>
This commit is contained in:
Andreas Färber 2013-06-30 19:22:12 +02:00 committed by Andreas Färber
parent 9b5f952bb8
commit 9eb39db520
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/misc/a9scu.c
View File

@ -13,7 +13,10 @@
/* A9MP private memory region. */ /* A9MP private memory region. */
typedef struct A9SCUState { typedef struct A9SCUState {
SysBusDevice busdev; /*< private >*/
SysBusDevice parent_obj;
/*< public >*/
MemoryRegion iomem; MemoryRegion iomem;
uint32_t control; uint32_t control;
uint32_t status; uint32_t status;
@ -114,12 +117,12 @@ static void a9_scu_reset(DeviceState *dev)
s->control = 0; s->control = 0;
} }
static void a9_scu_realize(DeviceState *dev, Error ** errp) static void a9_scu_init(Object *obj)
{ {
A9SCUState *s = A9_SCU(dev); A9SCUState *s = A9_SCU(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev); 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); "a9-scu", 0x100);
sysbus_init_mmio(sbd, &s->iomem); 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); DeviceClass *dc = DEVICE_CLASS(klass);
dc->realize = a9_scu_realize;
dc->props = a9_scu_properties; dc->props = a9_scu_properties;
dc->vmsd = &vmstate_a9_scu; dc->vmsd = &vmstate_a9_scu;
dc->reset = a9_scu_reset; dc->reset = a9_scu_reset;
@ -154,6 +156,7 @@ static const TypeInfo a9_scu_info = {
.name = TYPE_A9_SCU, .name = TYPE_A9_SCU,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(A9SCUState), .instance_size = sizeof(A9SCUState),
.instance_init = a9_scu_init,
.class_init = a9_scu_class_init, .class_init = a9_scu_class_init,
}; };