diff options
| author | Andreas Färber <andreas.faerber@web.de> | 2013-06-30 21:22:54 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-11-05 17:47:30 +0100 |
| commit | 7c76a48db48accca337e1e99b9085646b696a895 (patch) | |
| tree | fa461fdb1feeb1541340c4fae9986c2331195ac4 /hw/cpu | |
| parent | 524a2d8e2628b3241f0dcaa6a96d57e8120cc439 (diff) | |
| download | qemu-7c76a48db48accca337e1e99b9085646b696a895.zip | |
a15mpcore: Convert to QOM realize
Turn SysBusDevice initfn into a QOM realizefn.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Diffstat (limited to 'hw/cpu')
| -rw-r--r-- | hw/cpu/a15mpcore.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index b2614e7208..10dc35af5b 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -67,24 +67,30 @@ static void a15mp_priv_initfn(Object *obj) qdev_prop_set_uint32(gicdev, "revision", 2); } -static int a15mp_priv_init(SysBusDevice *dev) +static void a15mp_priv_realize(DeviceState *dev, Error **errp) { + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); A15MPPrivState *s = A15MPCORE_PRIV(dev); DeviceState *gicdev; SysBusDevice *busdev; int i; + Error *err = NULL; gicdev = DEVICE(&s->gic); qdev_prop_set_uint32(gicdev, "num-cpu", s->num_cpu); qdev_prop_set_uint32(gicdev, "num-irq", s->num_irq); - qdev_init_nofail(gicdev); + object_property_set_bool(OBJECT(&s->gic), true, "realized", &err); + if (err != NULL) { + error_propagate(errp, err); + return; + } busdev = SYS_BUS_DEVICE(&s->gic); /* Pass through outbound IRQ lines from the GIC */ - sysbus_pass_irq(dev, busdev); + sysbus_pass_irq(sbd, busdev); /* Pass through inbound GPIO lines to the GIC */ - qdev_init_gpio_in(DEVICE(dev), a15mp_priv_set_irq, s->num_irq - 32); + qdev_init_gpio_in(dev, a15mp_priv_set_irq, s->num_irq - 32); /* Wire the outputs from each CPU's generic timer to the * appropriate GIC PPI inputs @@ -114,8 +120,6 @@ static int a15mp_priv_init(SysBusDevice *dev) sysbus_mmio_get_region(busdev, 0)); memory_region_add_subregion(&s->container, 0x2000, sysbus_mmio_get_region(busdev, 1)); - - return 0; } static Property a15mp_priv_properties[] = { @@ -133,8 +137,8 @@ static Property a15mp_priv_properties[] = { static void a15mp_priv_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = a15mp_priv_init; + + dc->realize = a15mp_priv_realize; dc->props = a15mp_priv_properties; /* We currently have no savable state */ } |