From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gR-00033u-Sx for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V34gM-0008GE-UD for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:19 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36062 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gM-0008G2-Nm for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:14 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 15:36:53 +0200 Message-Id: <1374932223-7490-11-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 10/20] grlib_gptimer: 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?= , Fabien Chouteau Signed-off-by: Andreas F=C3=A4rber --- hw/timer/grlib_gptimer.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 37ba47d..7c1055a 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -50,6 +50,10 @@ #define COUNTER_RELOAD_OFFSET 0x04 #define TIMER_BASE 0x10 =20 +#define TYPE_GRLIB_GPTIMER "grlib,gptimer" +#define GRLIB_GPTIMER(obj) \ + OBJECT_CHECK(GPTimerUnit, (obj), TYPE_GRLIB_GPTIMER) + typedef struct GPTimer GPTimer; typedef struct GPTimerUnit GPTimerUnit; =20 @@ -68,7 +72,8 @@ struct GPTimer { }; =20 struct GPTimerUnit { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; =20 uint32_t nr_timers; /* Number of timers available */ @@ -314,7 +319,7 @@ static const MemoryRegionOps grlib_gptimer_ops =3D { =20 static void grlib_gptimer_reset(DeviceState *d) { - GPTimerUnit *unit =3D container_of(d, GPTimerUnit, busdev.qdev); + GPTimerUnit *unit =3D GRLIB_GPTIMER(d); int i =3D 0; =20 assert(unit !=3D NULL); @@ -343,7 +348,7 @@ static void grlib_gptimer_reset(DeviceState *d) =20 static int grlib_gptimer_init(SysBusDevice *dev) { - GPTimerUnit *unit =3D FROM_SYSBUS(typeof(*unit), dev); + GPTimerUnit *unit =3D GRLIB_GPTIMER(dev); unsigned int i; =20 assert(unit->nr_timers > 0); @@ -391,7 +396,7 @@ static void grlib_gptimer_class_init(ObjectClass *kla= ss, void *data) } =20 static const TypeInfo grlib_gptimer_info =3D { - .name =3D "grlib,gptimer", + .name =3D TYPE_GRLIB_GPTIMER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(GPTimerUnit), .class_init =3D grlib_gptimer_class_init, --=20 1.8.1.4