From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gK-0002uV-Bk for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V34gJ-0008E2-9L for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36049 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gJ-0008Dn-2p for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:11 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8A64DA51B7 for ; Sat, 27 Jul 2013 15:37:10 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 15:36:46 +0200 Message-Id: <1374932223-7490-4-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 03/20] arm_timer: QOM cast cleanup for icp_pit_state 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/arm_timer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 8d95743..acfea59 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -298,8 +298,13 @@ static int sp804_init(SysBusDevice *sbd) =20 /* Integrator/CP timer module. */ =20 +#define TYPE_INTEGRATOR_PIT "integrator_pit" +#define INTEGRATOR_PIT(obj) \ + OBJECT_CHECK(icp_pit_state, (obj), TYPE_INTEGRATOR_PIT) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; arm_timer_state *timer[3]; } icp_pit_state; @@ -341,7 +346,7 @@ static const MemoryRegionOps icp_pit_ops =3D { =20 static int icp_pit_init(SysBusDevice *dev) { - icp_pit_state *s =3D FROM_SYSBUS(icp_pit_state, dev); + icp_pit_state *s =3D INTEGRATOR_PIT(dev); =20 /* Timer 0 runs at the system clock speed (40MHz). */ s->timer[0] =3D arm_timer_init(40000000); @@ -369,7 +374,7 @@ static void icp_pit_class_init(ObjectClass *klass, vo= id *data) } =20 static const TypeInfo icp_pit_info =3D { - .name =3D "integrator_pit", + .name =3D TYPE_INTEGRATOR_PIT, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(icp_pit_state), .class_init =3D icp_pit_class_init, --=20 1.8.1.4