[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 32/58] a15mpcore: Convert to QOM realize
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 32/58] a15mpcore: Convert to QOM realize |
Date: |
Tue, 8 Oct 2013 19:44:30 +0200 |
From: Andreas Färber <address@hidden>
Turn SysBusDevice initfn into a QOM realizefn.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/cpu/a15mpcore.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index b2614e7..10dc35a 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 */
}
--
1.8.1.4
- [Qemu-devel] [PULL 24/58] a9scu: QOM cleanups, (continued)
- [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, 2013/10/08
- [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 <=
- [Qemu-devel] [PULL 23/58] a9mpcore: Embed GICState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 31/58] a15mpcore: Embed GICState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 17/58] shix: Don't require firmware presence for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 08/58] palm: Don't enforce loading ROM or kernel for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 04/58] puv3: Turn puv3_load_kernel() into a no-op for qtest without -kernel, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 07/58] z2: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 40/58] realview_gic: Convert to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 51/58] qom: Include error.h directly in object.h, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 34/58] a9scu: Build only once, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 35/58] arm11mpcore: Fix typo in MemoryRegion name, Andreas Färber, 2013/10/08