From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1L-0004Wv-BG for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1C-0002fq-4V for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53451 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1B-0002fh-QM for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:06 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6322CA5388 for ; Mon, 29 Jul 2013 21:22:05 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:19 +0200 Message-Id: <1375125630-24869-103-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-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 102/173] realview_gic: QOM cast cleanup 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?= Signed-off-by: Andreas F=C3=A4rber --- hw/intc/realview_gic.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c index e122c2c..ce80447 100644 --- a/hw/intc/realview_gic.c +++ b/hw/intc/realview_gic.c @@ -9,8 +9,13 @@ =20 #include "hw/sysbus.h" =20 +#define TYPE_REALVIEW_GIC "realview_gic" +#define REALVIEW_GIC(obj) \ + OBJECT_CHECK(RealViewGICState, (obj), TYPE_REALVIEW_GIC) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + DeviceState *gic; MemoryRegion container; } RealViewGICState; @@ -21,9 +26,10 @@ static void realview_gic_set_irq(void *opaque, int irq= , int level) qemu_set_irq(qdev_get_gpio_in(s->gic, irq), level); } =20 -static int realview_gic_init(SysBusDevice *dev) +static int realview_gic_init(SysBusDevice *sbd) { - RealViewGICState *s =3D FROM_SYSBUS(RealViewGICState, dev); + DeviceState *dev =3D DEVICE(sbd); + RealViewGICState *s =3D REALVIEW_GIC(dev); SysBusDevice *busdev; /* The GICs on the RealView boards have a fixed nonconfigurable * number of interrupt lines, so we don't need to expose this as @@ -38,10 +44,10 @@ static int realview_gic_init(SysBusDevice *dev) busdev =3D SYS_BUS_DEVICE(s->gic); =20 /* Pass through outbound IRQ lines from the GIC */ - sysbus_pass_irq(dev, busdev); + sysbus_pass_irq(sbd, busdev); =20 /* Pass through inbound GPIO lines to the GIC */ - qdev_init_gpio_in(&s->busdev.qdev, realview_gic_set_irq, numirq - 32= ); + qdev_init_gpio_in(dev, realview_gic_set_irq, numirq - 32); =20 memory_region_init(&s->container, OBJECT(s), "realview-gic-container", 0x2000); @@ -49,7 +55,7 @@ static int realview_gic_init(SysBusDevice *dev) sysbus_mmio_get_region(busdev, 1)); memory_region_add_subregion(&s->container, 0x1000, sysbus_mmio_get_region(busdev, 0)); - sysbus_init_mmio(dev, &s->container); + sysbus_init_mmio(sbd, &s->container); return 0; } =20 @@ -61,7 +67,7 @@ static void realview_gic_class_init(ObjectClass *klass,= void *data) } =20 static const TypeInfo realview_gic_info =3D { - .name =3D "realview_gic", + .name =3D TYPE_REALVIEW_GIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(RealViewGICState), .class_init =3D realview_gic_class_init, --=20 1.8.1.4