From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gN-0002w2-K2 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V34gK-0008Ef-3u for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36054 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gJ-0008EP-T5 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:12 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 15:36:49 +0200 Message-Id: <1374932223-7490-7-git-send-email-afaerber@suse.de> In-Reply-To: <1374932223-7490-1-git-send-email-afaerber@suse.de> References: <1374932223-7490-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 06/20] etraxfs_timer: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/timer/etraxfs_timer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index 7e9807d..a38d9e4 100644 --- a/hw/timer/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.c @@ -42,8 +42,13 @@ #define R_INTR 0x50 #define R_MASKED_INTR 0x54 =20 +#define TYPE_ETRAX_FS_TIMER "etraxfs,timer" +#define ETRAX_TIMER(obj) \ + OBJECT_CHECK(ETRAXTimerState, (obj), TYPE_ETRAX_FS_TIMER) + typedef struct ETRAXTimerState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion mmio; qemu_irq irq; qemu_irq nmi; @@ -311,7 +316,7 @@ static void etraxfs_timer_reset(void *opaque) =20 static int etraxfs_timer_init(SysBusDevice *dev) { - ETRAXTimerState *t =3D FROM_SYSBUS(typeof (*t), dev); + ETRAXTimerState *t =3D ETRAX_TIMER(dev); =20 t->bh_t0 =3D qemu_bh_new(timer0_hit, t); t->bh_t1 =3D qemu_bh_new(timer1_hit, t); @@ -338,7 +343,7 @@ static void etraxfs_timer_class_init(ObjectClass *kla= ss, void *data) } =20 static const TypeInfo etraxfs_timer_info =3D { - .name =3D "etraxfs,timer", + .name =3D TYPE_ETRAX_FS_TIMER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ETRAXTimerState), .class_init =3D etraxfs_timer_class_init, --=20 1.8.1.4