From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbe7-00053m-6H for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTbdt-0007Xm-PU for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:35 -0400 Received: from cantor2.suse.de ([195.135.220.15]:43020 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbdt-0007V6-CD for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:21 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 7A7B9A56D0 for ; Tue, 8 Oct 2013 19:45:06 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 8 Oct 2013 19:44:38 +0200 Message-Id: <1381254296-3203-41-git-send-email-afaerber@suse.de> In-Reply-To: <1381254296-3203-1-git-send-email-afaerber@suse.de> References: <1381254296-3203-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 40/58] realview_gic: Convert to QOM realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Embed GICState and replace SysBus initfn with realizefn. Reviewed-by: Peter Maydell Signed-off-by: Andreas F=C3=A4rber --- 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 @@ */ =20 #include "hw/sysbus.h" +#include "hw/intc/arm_gic.h" =20 #define TYPE_REALVIEW_GIC "realview_gic" #define REALVIEW_GIC(obj) \ OBJECT_CHECK(RealViewGICState, (obj), TYPE_REALVIEW_GIC) =20 -typedef struct { +typedef struct RealViewGICState { SysBusDevice parent_obj; =20 - DeviceState *gic; MemoryRegion container; + + GICState gic; } RealViewGICState; =20 static void realview_gic_set_irq(void *opaque, int irq, int level) { RealViewGICState *s =3D (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); } =20 -static int realview_gic_init(SysBusDevice *sbd) +static void realview_gic_realize(DeviceState *dev, Error **errp) { - DeviceState *dev =3D DEVICE(sbd); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); RealViewGICState *s =3D REALVIEW_GIC(dev); SysBusDevice *busdev; + Error *err =3D 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 =3D 96; =20 - s->gic =3D 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 =3D 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 !=3D NULL) { + error_propagate(errp, err); + return; + } + busdev =3D SYS_BUS_DEVICE(&s->gic); =20 /* 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); =20 - 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 =3D SYS_BUS_DEVICE(obj); + RealViewGICState *s =3D 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 =3D DEVICE(&s->gic); + qdev_set_parent_bus(gicdev, sysbus_get_default()); + qdev_prop_set_uint32(gicdev, "num-cpu", 1); } =20 -static void realview_gic_class_init(ObjectClass *klass, void *data) +static void realview_gic_class_init(ObjectClass *oc, void *data) { - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(oc); =20 - sdc->init =3D realview_gic_init; + dc->realize =3D realview_gic_realize; } =20 static const TypeInfo realview_gic_info =3D { .name =3D TYPE_REALVIEW_GIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(RealViewGICState), + .instance_init =3D realview_gic_init, .class_init =3D realview_gic_class_init, }; =20 --=20 1.8.1.4