From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1F-0004LA-7f for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t15-0002da-SG for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:09 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53429 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t15-0002dQ-Jx for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:59 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:11 +0200 Message-Id: <1375125630-24869-95-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 094/173] exynos4210_gic: QOM cast cleanup for exynos4210.gic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Maksim Kozlov , Igor Mitsyanko , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Evgeny Voevodin , Dmitry Solodkiy Signed-off-by: Andreas F=C3=A4rber --- hw/intc/exynos4210_gic.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index 6147f04..f9afb97 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -260,8 +260,13 @@ uint32_t exynos4210_get_irq(uint32_t grp, uint32_t b= it) =20 /********* GIC part *********/ =20 +#define TYPE_EXYNOS4210_GIC "exynos4210.gic" +#define EXYNOS4210_GIC(obj) \ + OBJECT_CHECK(Exynos4210GicState, (obj), TYPE_EXYNOS4210_GIC) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion cpu_container; MemoryRegion dist_container; MemoryRegion cpu_alias[EXYNOS4210_NCPUS]; @@ -276,9 +281,10 @@ static void exynos4210_gic_set_irq(void *opaque, int= irq, int level) qemu_set_irq(qdev_get_gpio_in(s->gic, irq), level); } =20 -static int exynos4210_gic_init(SysBusDevice *dev) +static int exynos4210_gic_init(SysBusDevice *sbd) { - Exynos4210GicState *s =3D FROM_SYSBUS(Exynos4210GicState, dev); + DeviceState *dev =3D DEVICE(sbd); + Exynos4210GicState *s =3D EXYNOS4210_GIC(dev); uint32_t i; const char cpu_prefix[] =3D "exynos4210-gic-alias_cpu"; const char dist_prefix[] =3D "exynos4210-gic-alias_dist"; @@ -293,10 +299,10 @@ static int exynos4210_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, exynos4210_gic_set_irq, + qdev_init_gpio_in(dev, exynos4210_gic_set_irq, EXYNOS4210_GIC_NIRQ - 32); =20 memory_region_init(&s->cpu_container, OBJECT(s), "exynos4210-cpu-con= tainer", @@ -326,8 +332,8 @@ static int exynos4210_gic_init(SysBusDevice *dev) EXYNOS4210_EXT_GIC_DIST_GET_OFFSET(i), &s->dist_alias[i]= ); } =20 - sysbus_init_mmio(dev, &s->cpu_container); - sysbus_init_mmio(dev, &s->dist_container); + sysbus_init_mmio(sbd, &s->cpu_container); + sysbus_init_mmio(sbd, &s->dist_container); =20 return 0; } @@ -347,7 +353,7 @@ static void exynos4210_gic_class_init(ObjectClass *kl= ass, void *data) } =20 static const TypeInfo exynos4210_gic_info =3D { - .name =3D "exynos4210.gic", + .name =3D TYPE_EXYNOS4210_GIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(Exynos4210GicState), .class_init =3D exynos4210_gic_class_init, --=20 1.8.1.4