From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gV-0003AA-KA for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V34gR-0008II-HC for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:23 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36074 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gQ-0008Hz-Ux for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:19 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6CC5BA50DE for ; Sat, 27 Jul 2013 15:37:18 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 15:37:01 +0200 Message-Id: <1374932223-7490-19-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 18/20] slavio_timer: 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/timer/slavio_timer.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 7f844d7..33e8f6c 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -54,8 +54,13 @@ typedef struct CPUTimerState { uint64_t limit; } CPUTimerState; =20 +#define TYPE_SLAVIO_TIMER "slavio_timer" +#define SLAVIO_TIMER(obj) \ + OBJECT_CHECK(SLAVIO_TIMERState, (obj), TYPE_SLAVIO_TIMER) + typedef struct SLAVIO_TIMERState { - SysBusDevice busdev; + SysBusDevice parent_obj; + uint32_t num_cpus; uint32_t cputimer_mode; CPUTimerState cputimer[MAX_CPUS + 1]; @@ -354,7 +359,7 @@ static const VMStateDescription vmstate_slavio_timer = =3D { =20 static void slavio_timer_reset(DeviceState *d) { - SLAVIO_TIMERState *s =3D container_of(d, SLAVIO_TIMERState, busdev.q= dev); + SLAVIO_TIMERState *s =3D SLAVIO_TIMER(d); unsigned int i; CPUTimerState *curr_timer; =20 @@ -375,7 +380,7 @@ static void slavio_timer_reset(DeviceState *d) =20 static int slavio_timer_init1(SysBusDevice *dev) { - SLAVIO_TIMERState *s =3D FROM_SYSBUS(SLAVIO_TIMERState, dev); + SLAVIO_TIMERState *s =3D SLAVIO_TIMER(dev); QEMUBH *bh; unsigned int i; TimerContext *tc; @@ -421,7 +426,7 @@ static void slavio_timer_class_init(ObjectClass *klas= s, void *data) } =20 static const TypeInfo slavio_timer_info =3D { - .name =3D "slavio_timer", + .name =3D TYPE_SLAVIO_TIMER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SLAVIO_TIMERState), .class_init =3D slavio_timer_class_init, --=20 1.8.1.4