From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1u-00050U-4J for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:23:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1i-0002tC-RJ for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:50 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53524 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1i-0002t3-Gr for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:38 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:20:04 +0200 Message-Id: <1375125630-24869-148-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 147/173] cadence_ttc: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/timer/cadence_ttc.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c index a861049..888f9ce 100644 --- a/hw/timer/cadence_ttc.c +++ b/hw/timer/cadence_ttc.c @@ -64,8 +64,13 @@ typedef struct { qemu_irq irq; } CadenceTimerState; =20 -typedef struct { - SysBusDevice busdev; +#define TYPE_CADENCE_TTC "cadence_ttc" +#define CADENCE_TTC(obj) \ + OBJECT_CHECK(CadenceTTCState, (obj), TYPE_CADENCE_TTC) + +typedef struct CadenceTTCState { + SysBusDevice parent_obj; + MemoryRegion iomem; CadenceTimerState timer[3]; } CadenceTTCState; @@ -401,7 +406,7 @@ static void cadence_timer_init(uint32_t freq, Cadence= TimerState *s) =20 static int cadence_ttc_init(SysBusDevice *dev) { - CadenceTTCState *s =3D FROM_SYSBUS(CadenceTTCState, dev); + CadenceTTCState *s =3D CADENCE_TTC(dev); int i; =20 for (i =3D 0; i < 3; ++i) { @@ -476,7 +481,7 @@ static void cadence_ttc_class_init(ObjectClass *klass= , void *data) } =20 static const TypeInfo cadence_ttc_info =3D { - .name =3D "cadence_ttc", + .name =3D TYPE_CADENCE_TTC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(CadenceTTCState), .class_init =3D cadence_ttc_class_init, --=20 1.8.1.4