From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t2B-0005Th-EE for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:23:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1y-0002yf-CA for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:23:07 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53552 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1x-0002yR-Tg for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:54 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:20:20 +0200 Message-Id: <1375125630-24869-164-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 163/173] xilinx_timer: 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/timer/xilinx_timer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index ee53834..5f2c902 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -57,9 +57,14 @@ struct xlx_timer uint32_t regs[R_MAX]; }; =20 +#define TYPE_XILINX_TIMER "xlnx.xps-timer" +#define XILINX_TIMER(obj) \ + OBJECT_CHECK(struct timerblock, (obj), TYPE_XILINX_TIMER) + struct timerblock { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion mmio; qemu_irq irq; uint8_t one_timer_only; @@ -200,7 +205,7 @@ static void timer_hit(void *opaque) =20 static int xilinx_timer_init(SysBusDevice *dev) { - struct timerblock *t =3D FROM_SYSBUS(typeof (*t), dev); + struct timerblock *t =3D XILINX_TIMER(dev); unsigned int i; =20 /* All timers share a single irq line. */ @@ -241,7 +246,7 @@ static void xilinx_timer_class_init(ObjectClass *klas= s, void *data) } =20 static const TypeInfo xilinx_timer_info =3D { - .name =3D "xlnx.xps-timer", + .name =3D TYPE_XILINX_TIMER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(struct timerblock), .class_init =3D xilinx_timer_class_init, --=20 1.8.1.4