From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2n9r-00018e-JQ for qemu-devel@nongnu.org; Fri, 26 Jul 2013 14:54:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2n9q-0001ln-1H for qemu-devel@nongnu.org; Fri, 26 Jul 2013 14:54:31 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41750 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2n9p-0001lf-LH for qemu-devel@nongnu.org; Fri, 26 Jul 2013 14:54:29 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 159F4A51CB for ; Fri, 26 Jul 2013 20:54:29 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 20:54:13 +0200 Message-Id: <1374864854-32454-15-git-send-email-afaerber@suse.de> In-Reply-To: <1374864854-32454-1-git-send-email-afaerber@suse.de> References: <1374864854-32454-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] [PATCH qom-next for-1.6 14/15] slavio_intctl: 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/slavio_intctl.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c index b47d0f0..41a1672 100644 --- a/hw/intc/slavio_intctl.c +++ b/hw/intc/slavio_intctl.c @@ -53,8 +53,13 @@ typedef struct SLAVIO_CPUINTCTLState { uint32_t irl_out; } SLAVIO_CPUINTCTLState; =20 +#define TYPE_SLAVIO_INTCTL "slavio_intctl" +#define SLAVIO_INTCTL(obj) \ + OBJECT_CHECK(SLAVIO_INTCTLState, (obj), TYPE_SLAVIO_INTCTL) + typedef struct SLAVIO_INTCTLState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; #ifdef DEBUG_IRQ_COUNT uint64_t irq_count[32]; @@ -206,12 +211,9 @@ static const MemoryRegionOps slavio_intctlm_mem_ops = =3D { =20 void slavio_pic_info(Monitor *mon, DeviceState *dev) { - SysBusDevice *sd; - SLAVIO_INTCTLState *s; + SLAVIO_INTCTLState *s =3D SLAVIO_INTCTL(dev); int i; =20 - sd =3D SYS_BUS_DEVICE(dev); - s =3D FROM_SYSBUS(SLAVIO_INTCTLState, sd); for (i =3D 0; i < MAX_CPUS; i++) { monitor_printf(mon, "per-cpu %d: pending 0x%08x\n", i, s->slaves[i].intreg_pending); @@ -225,13 +227,11 @@ void slavio_irq_info(Monitor *mon, DeviceState *dev= ) #ifndef DEBUG_IRQ_COUNT monitor_printf(mon, "irq statistic code not compiled.\n"); #else - SysBusDevice *sd; - SLAVIO_INTCTLState *s; + SLAVIO_INTCTLState *s =3D SLAVIO_INTCTL(dev); int i; int64_t count; =20 - sd =3D SYS_BUS_DEVICE(dev); - s =3D FROM_SYSBUS(SLAVIO_INTCTLState, sd); + s =3D SLAVIO_INTCTL(dev); monitor_printf(mon, "IRQ statistics:\n"); for (i =3D 0; i < 32; i++) { count =3D s->irq_count[i]; @@ -406,7 +406,7 @@ static const VMStateDescription vmstate_intctl =3D { =20 static void slavio_intctl_reset(DeviceState *d) { - SLAVIO_INTCTLState *s =3D container_of(d, SLAVIO_INTCTLState, busdev= .qdev); + SLAVIO_INTCTLState *s =3D SLAVIO_INTCTL(d); int i; =20 for (i =3D 0; i < MAX_CPUS; i++) { @@ -419,27 +419,28 @@ static void slavio_intctl_reset(DeviceState *d) slavio_check_interrupts(s, 0); } =20 -static int slavio_intctl_init1(SysBusDevice *dev) +static int slavio_intctl_init1(SysBusDevice *sbd) { - SLAVIO_INTCTLState *s =3D FROM_SYSBUS(SLAVIO_INTCTLState, dev); + DeviceState *dev =3D DEVICE(sbd); + SLAVIO_INTCTLState *s =3D SLAVIO_INTCTL(dev); unsigned int i, j; char slave_name[45]; =20 - qdev_init_gpio_in(&dev->qdev, slavio_set_irq_all, 32 + MAX_CPUS); + qdev_init_gpio_in(dev, slavio_set_irq_all, 32 + MAX_CPUS); memory_region_init_io(&s->iomem, OBJECT(s), &slavio_intctlm_mem_ops,= s, "master-interrupt-controller", INTCTLM_SIZE); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); =20 for (i =3D 0; i < MAX_CPUS; i++) { snprintf(slave_name, sizeof(slave_name), "slave-interrupt-controller-%i", i); for (j =3D 0; j < MAX_PILS; j++) { - sysbus_init_irq(dev, &s->cpu_irqs[i][j]); + sysbus_init_irq(sbd, &s->cpu_irqs[i][j]); } memory_region_init_io(&s->slaves[i].iomem, OBJECT(s), &slavio_intctl_mem_ops, &s->slaves[i], slave_name, INTCTL_SIZE); - sysbus_init_mmio(dev, &s->slaves[i].iomem); + sysbus_init_mmio(sbd, &s->slaves[i].iomem); s->slaves[i].cpu =3D i; s->slaves[i].master =3D s; } @@ -458,7 +459,7 @@ static void slavio_intctl_class_init(ObjectClass *kla= ss, void *data) } =20 static const TypeInfo slavio_intctl_info =3D { - .name =3D "slavio_intctl", + .name =3D TYPE_SLAVIO_INTCTL, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SLAVIO_INTCTLState), .class_init =3D slavio_intctl_class_init, --=20 1.8.1.4