From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1N-0004ag-Jn for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1D-0002ge-Fu for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:17 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53453 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1D-0002gV-AJ for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:07 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:21 +0200 Message-Id: <1375125630-24869-105-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 104/173] xilinx_intc: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/intc/xilinx_intc.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index 25d2057..4a10398 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -37,9 +37,13 @@ #define R_MER 7 #define R_MAX 8 =20 +#define TYPE_XILINX_INTC "xlnx.xps-intc" +#define XILINX_INTC(obj) OBJECT_CHECK(struct xlx_pic, (obj), TYPE_XILINX= _INTC) + struct xlx_pic { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion mmio; qemu_irq parent_irq; =20 @@ -153,16 +157,17 @@ static void irq_handler(void *opaque, int irq, int = level) update_irq(p); } =20 -static int xilinx_intc_init(SysBusDevice *dev) +static int xilinx_intc_init(SysBusDevice *sbd) { - struct xlx_pic *p =3D FROM_SYSBUS(typeof (*p), dev); + DeviceState *dev =3D DEVICE(sbd); + struct xlx_pic *p =3D XILINX_INTC(dev); =20 - qdev_init_gpio_in(&dev->qdev, irq_handler, 32); - sysbus_init_irq(dev, &p->parent_irq); + qdev_init_gpio_in(dev, irq_handler, 32); + sysbus_init_irq(sbd, &p->parent_irq); =20 memory_region_init_io(&p->mmio, OBJECT(p), &pic_ops, p, "xlnx.xps-in= tc", R_MAX * 4); - sysbus_init_mmio(dev, &p->mmio); + sysbus_init_mmio(sbd, &p->mmio); return 0; } =20 @@ -181,7 +186,7 @@ static void xilinx_intc_class_init(ObjectClass *klass= , void *data) } =20 static const TypeInfo xilinx_intc_info =3D { - .name =3D "xlnx.xps-intc", + .name =3D TYPE_XILINX_INTC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(struct xlx_pic), .class_init =3D xilinx_intc_class_init, --=20 1.8.1.4