From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1SZe-00088Y-03 for qemu-devel@nongnu.org; Mon, 22 Jul 2013 22:43:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1SZc-0000rx-Kv for qemu-devel@nongnu.org; Mon, 22 Jul 2013 22:43:37 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49473 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1SZc-0000rj-FT for qemu-devel@nongnu.org; Mon, 22 Jul 2013 22:43:36 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id F1C59A41E0 for ; Tue, 23 Jul 2013 04:43:35 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 23 Jul 2013 04:43:15 +0200 Message-Id: <1374547404-11700-8-git-send-email-afaerber@suse.de> In-Reply-To: <1374547404-11700-1-git-send-email-afaerber@suse.de> References: <1374547404-11700-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 v2 07/16] timer/arm_mptimer: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 0ceb240..9277315 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -41,8 +41,15 @@ typedef struct { MemoryRegion iomem; } TimerBlock; =20 +#define TYPE_ARM_MPTIMER "arm_mptimer" +#define ARM_MPTIMER(obj) \ + OBJECT_CHECK(ARMMPTimerState, (obj), TYPE_ARM_MPTIMER) + typedef struct { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + uint32_t num_cpu; TimerBlock timerblock[MAX_CPUS]; MemoryRegion iomem; @@ -210,9 +217,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_MPTIMER(dev); int i; + for (i =3D 0; i < ARRAY_SIZE(s->timerblock); i++) { timerblock_reset(&s->timerblock[i]); } @@ -220,8 +227,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_MPTIMER(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); } @@ -294,7 +302,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_MPTIMER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ARMMPTimerState), .class_init =3D arm_mptimer_class_init, --=20 1.8.1.4