From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2peb-0004UD-9f for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2peZ-0003pn-3u for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:25 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46359 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2peY-0003pG-Rf for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:23 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 5BECAA52D7 for ; Fri, 26 Jul 2013 23:34:22 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 23:34:03 +0200 Message-Id: <1374874454-15549-4-git-send-email-afaerber@suse.de> In-Reply-To: <1374874454-15549-1-git-send-email-afaerber@suse.de> References: <1374874454-15549-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/14] arm_sysctl: 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?= Signed-off-by: Andreas F=C3=A4rber --- hw/misc/arm_sysctl.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index 5906ae5..4a911d4 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -16,8 +16,13 @@ =20 #define LOCK_VALUE 0xa05f =20 +#define TYPE_ARM_SYSCTL "realview_sysctl" +#define ARM_SYSCTL(obj) \ + OBJECT_CHECK(arm_sysctl_state, (obj), TYPE_ARM_SYSCTL) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; qemu_irq pl110_mux_ctrl; =20 @@ -85,7 +90,7 @@ static int board_id(arm_sysctl_state *s) =20 static void arm_sysctl_reset(DeviceState *d) { - arm_sysctl_state *s =3D FROM_SYSBUS(arm_sysctl_state, SYS_BUS_DEVICE= (d)); + arm_sysctl_state *s =3D ARM_SYSCTL(d); int i; =20 s->leds =3D 0; @@ -587,7 +592,7 @@ static void arm_sysctl_init(Object *obj) { DeviceState *dev =3D DEVICE(obj); SysBusDevice *sd =3D SYS_BUS_DEVICE(obj); - arm_sysctl_state *s =3D FROM_SYSBUS(arm_sysctl_state, sd); + arm_sysctl_state *s =3D ARM_SYSCTL(obj); =20 memory_region_init_io(&s->iomem, OBJECT(dev), &arm_sysctl_ops, s, "arm-sysctl", 0x1000); @@ -598,14 +603,15 @@ static void arm_sysctl_init(Object *obj) =20 static void arm_sysctl_realize(DeviceState *d, Error **errp) { - arm_sysctl_state *s =3D FROM_SYSBUS(arm_sysctl_state, SYS_BUS_DEVICE= (d)); + arm_sysctl_state *s =3D ARM_SYSCTL(d); + s->db_clock =3D g_new0(uint32_t, s->db_num_clocks); } =20 static void arm_sysctl_finalize(Object *obj) { - SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); - arm_sysctl_state *s =3D FROM_SYSBUS(arm_sysctl_state, dev); + arm_sysctl_state *s =3D ARM_SYSCTL(obj); + g_free(s->db_voltage); g_free(s->db_clock); g_free(s->db_clock_reset); @@ -634,7 +640,7 @@ static void arm_sysctl_class_init(ObjectClass *klass,= void *data) } =20 static const TypeInfo arm_sysctl_info =3D { - .name =3D "realview_sysctl", + .name =3D TYPE_ARM_SYSCTL, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(arm_sysctl_state), .instance_init =3D arm_sysctl_init, --=20 1.8.1.4