From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1C-0004Fs-B9 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t13-0002c7-7s for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:06 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53420 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t12-0002bf-Tr for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:57 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 70B09A52BF for ; Mon, 29 Jul 2013 21:21:56 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:08 +0200 Message-Id: <1375125630-24869-92-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 091/173] arm_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/arm_gic.c | 5 +++-- hw/intc/arm_gic_common.c | 2 +- hw/intc/gic_internal.h | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index 8e34004..d431b7a 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -639,6 +639,7 @@ static const MemoryRegionOps gic_cpu_ops =3D { =20 void gic_init_irqs_and_distributor(GICState *s, int num_irq) { + SysBusDevice *sbd =3D SYS_BUS_DEVICE(s); int i; =20 i =3D s->num_irq - GIC_INTERNAL; @@ -652,9 +653,9 @@ void gic_init_irqs_and_distributor(GICState *s, int n= um_irq) if (s->revision !=3D REV_NVIC) { i +=3D (GIC_INTERNAL * s->num_cpu); } - qdev_init_gpio_in(&s->busdev.qdev, gic_set_irq, i); + qdev_init_gpio_in(DEVICE(s), gic_set_irq, i); for (i =3D 0; i < NUM_CPU(s); i++) { - sysbus_init_irq(&s->busdev, &s->parent_irq[i]); + sysbus_init_irq(sbd, &s->parent_irq[i]); } memory_region_init_io(&s->iomem, OBJECT(s), &gic_dist_ops, s, "gic_dist", 0x1000); diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c index 08560f2..709b5c2 100644 --- a/hw/intc/arm_gic_common.c +++ b/hw/intc/arm_gic_common.c @@ -110,7 +110,7 @@ static void arm_gic_common_realize(DeviceState *dev, = Error **errp) =20 static void arm_gic_common_reset(DeviceState *dev) { - GICState *s =3D FROM_SYSBUS(GICState, SYS_BUS_DEVICE(dev)); + GICState *s =3D ARM_GIC_COMMON(dev); int i; memset(s->irq_state, 0, GIC_MAXIRQ * sizeof(gic_irq_state)); for (i =3D 0 ; i < s->num_cpu; i++) { diff --git a/hw/intc/gic_internal.h b/hw/intc/gic_internal.h index 99a3bc3..1426437 100644 --- a/hw/intc/gic_internal.h +++ b/hw/intc/gic_internal.h @@ -70,7 +70,10 @@ typedef struct gic_irq_state { } gic_irq_state; =20 typedef struct GICState { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + qemu_irq parent_irq[NCPU]; bool enabled; bool cpu_enabled[NCPU]; --=20 1.8.1.4