[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 40/58] realview_gic: Convert to QOM realize
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 40/58] realview_gic: Convert to QOM realize |
Date: |
Tue, 8 Oct 2013 19:44:38 +0200 |
Embed GICState and replace SysBus initfn with realizefn.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/intc/realview_gic.c | 51 ++++++++++++++++++++++++++++++++++----------------
1 file changed, 35 insertions(+), 16 deletions(-)
diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c
index ce80447..4ff48bb 100644
--- a/hw/intc/realview_gic.c
+++ b/hw/intc/realview_gic.c
@@ -8,40 +8,46 @@
*/
#include "hw/sysbus.h"
+#include "hw/intc/arm_gic.h"
#define TYPE_REALVIEW_GIC "realview_gic"
#define REALVIEW_GIC(obj) \
OBJECT_CHECK(RealViewGICState, (obj), TYPE_REALVIEW_GIC)
-typedef struct {
+typedef struct RealViewGICState {
SysBusDevice parent_obj;
- DeviceState *gic;
MemoryRegion container;
+
+ GICState gic;
} RealViewGICState;
static void realview_gic_set_irq(void *opaque, int irq, int level)
{
RealViewGICState *s = (RealViewGICState *)opaque;
- qemu_set_irq(qdev_get_gpio_in(s->gic, irq), level);
+
+ qemu_set_irq(qdev_get_gpio_in(DEVICE(&s->gic), irq), level);
}
-static int realview_gic_init(SysBusDevice *sbd)
+static void realview_gic_realize(DeviceState *dev, Error **errp)
{
- DeviceState *dev = DEVICE(sbd);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
RealViewGICState *s = REALVIEW_GIC(dev);
SysBusDevice *busdev;
+ Error *err = NULL;
/* The GICs on the RealView boards have a fixed nonconfigurable
* number of interrupt lines, so we don't need to expose this as
* a qdev property.
*/
int numirq = 96;
- s->gic = qdev_create(NULL, "arm_gic");
- qdev_prop_set_uint32(s->gic, "num-cpu", 1);
- qdev_prop_set_uint32(s->gic, "num-irq", numirq);
- qdev_init_nofail(s->gic);
- busdev = SYS_BUS_DEVICE(s->gic);
+ qdev_prop_set_uint32(DEVICE(&s->gic), "num-irq", numirq);
+ 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(sbd, busdev);
@@ -49,27 +55,40 @@ static int realview_gic_init(SysBusDevice *sbd)
/* Pass through inbound GPIO lines to the GIC */
qdev_init_gpio_in(dev, realview_gic_set_irq, numirq - 32);
- memory_region_init(&s->container, OBJECT(s),
- "realview-gic-container", 0x2000);
memory_region_add_subregion(&s->container, 0,
sysbus_mmio_get_region(busdev, 1));
memory_region_add_subregion(&s->container, 0x1000,
sysbus_mmio_get_region(busdev, 0));
+}
+
+static void realview_gic_init(Object *obj)
+{
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
+ RealViewGICState *s = REALVIEW_GIC(obj);
+ DeviceState *gicdev;
+
+ memory_region_init(&s->container, OBJECT(s),
+ "realview-gic-container", 0x2000);
sysbus_init_mmio(sbd, &s->container);
- return 0;
+
+ object_initialize(&s->gic, sizeof(s->gic), TYPE_ARM_GIC);
+ gicdev = DEVICE(&s->gic);
+ qdev_set_parent_bus(gicdev, sysbus_get_default());
+ qdev_prop_set_uint32(gicdev, "num-cpu", 1);
}
-static void realview_gic_class_init(ObjectClass *klass, void *data)
+static void realview_gic_class_init(ObjectClass *oc, void *data)
{
- SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
+ DeviceClass *dc = DEVICE_CLASS(oc);
- sdc->init = realview_gic_init;
+ dc->realize = realview_gic_realize;
}
static const TypeInfo realview_gic_info = {
.name = TYPE_REALVIEW_GIC,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(RealViewGICState),
+ .instance_init = realview_gic_init,
.class_init = realview_gic_class_init,
};
--
1.8.1.4
- [Qemu-devel] [PULL 05/58] mainstone: Don't enforce use of -pflash for qtest, (continued)
- [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
- [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 <=
- [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
- [Qemu-devel] [PULL 26/58] arm_mptimer: Convert to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 10/58] exynos4_boards: Silence lack of -smp 2 warning for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 09/58] omap_sx1: Don't enforce use of kernel or flash for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 36/58] arm11mpcore: Drop unused fields, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 42/58] arm11mpcore: Convert mpcore_rirq_state to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 33/58] a15mpcore: Prepare for QOM embedding, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 44/58] arm11mpcore: Split off RealView MPCore, Andreas Färber, 2013/10/08