From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtOkL-0001IP-TB for qemu-devel@nongnu.org; Sun, 30 Jun 2013 17:01:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UtOkJ-0003js-3Q for qemu-devel@nongnu.org; Sun, 30 Jun 2013 17:01:21 -0400 Received: from cantor2.suse.de ([195.135.220.15]:58279 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtOkI-0003jU-Oy for qemu-devel@nongnu.org; Sun, 30 Jun 2013 17:01:18 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 30 Jun 2013 23:00:56 +0200 Message-Id: <1372626065-6043-7-git-send-email-afaerber@suse.de> In-Reply-To: <1372626065-6043-1-git-send-email-afaerber@suse.de> References: <1372626065-6043-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 RFC 06/15] timer/arm_mptimer: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Andreas F=C3=A4rber Introduce type constant and cast macro and rename ARMMPTimerState::busdev to enforce its use. Signed-off-by: Andreas F=C3=A4rber --- hw/timer/arm_mptimer.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index 317f5e4..588e34b 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -40,8 +40,15 @@ typedef struct { MemoryRegion iomem; } TimerBlock; =20 +#define TYPE_ARM_MP_TIMER "arm_mptimer" +#define ARM_MP_TIMER(obj) \ + OBJECT_CHECK(ARMMPTimerState, (obj), TYPE_ARM_MP_TIMER) + typedef struct { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + uint32_t num_cpu; TimerBlock timerblock[MAX_CPUS]; MemoryRegion iomem; @@ -211,9 +218,9 @@ static void timerblock_reset(TimerBlock *tb) =20 static void arm_mptimer_reset(DeviceState *dev) { - ARMMPTimerState *s =3D - FROM_SYSBUS(ARMMPTimerState, SYS_BUS_DEVICE(dev)); + ARMMPTimerState *s =3D ARM_MP_TIMER(dev); int i; + for (i =3D 0; i < ARRAY_SIZE(s->timerblock); i++) { timerblock_reset(&s->timerblock[i]); } @@ -221,8 +228,9 @@ static void arm_mptimer_reset(DeviceState *dev) =20 static int arm_mptimer_init(SysBusDevice *dev) { - ARMMPTimerState *s =3D FROM_SYSBUS(ARMMPTimerState, dev); + ARMMPTimerState *s =3D ARM_MP_TIMER(dev); int i; + if (s->num_cpu < 1 || s->num_cpu > MAX_CPUS) { hw_error("%s: num-cpu must be between 1 and %d\n", __func__, MAX= _CPUS); } @@ -295,7 +303,7 @@ static void arm_mptimer_class_init(ObjectClass *klass= , void *data) } =20 static const TypeInfo arm_mptimer_info =3D { - .name =3D "arm_mptimer", + .name =3D TYPE_ARM_MP_TIMER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ARMMPTimerState), .class_init =3D arm_mptimer_class_init, --=20 1.8.1.4