From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2peb-0004UF-AD 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-0003ph-1W for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:25 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46358 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2peY-0003pF-Rk for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:22 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 58B98A52C6 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:02 +0200 Message-Id: <1374874454-15549-3-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 02/14] arm_l2x0: 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_l2x0.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c index f3ce477..8e192cd 100644 --- a/hw/misc/arm_l2x0.c +++ b/hw/misc/arm_l2x0.c @@ -23,8 +23,12 @@ /* L2C-310 r3p2 */ #define CACHE_ID 0x410000c8 =20 +#define TYPE_ARM_L2X0 "l2x0" +#define ARM_L2X0(obj) OBJECT_CHECK(L2x0State, (obj), TYPE_ARM_L2X0) + typedef struct L2x0State { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; uint32_t cache_type; uint32_t ctrl; @@ -137,7 +141,7 @@ static void l2x0_priv_write(void *opaque, hwaddr offs= et, =20 static void l2x0_priv_reset(DeviceState *dev) { - L2x0State *s =3D DO_UPCAST(L2x0State, busdev.qdev, dev); + L2x0State *s =3D ARM_L2X0(dev); =20 s->ctrl =3D 0; s->aux_ctrl =3D 0x02020000; @@ -155,7 +159,7 @@ static const MemoryRegionOps l2x0_mem_ops =3D { =20 static int l2x0_priv_init(SysBusDevice *dev) { - L2x0State *s =3D FROM_SYSBUS(L2x0State, dev); + L2x0State *s =3D ARM_L2X0(dev); =20 memory_region_init_io(&s->iomem, OBJECT(dev), &l2x0_mem_ops, s, "l2x0_cc", 0x1000); @@ -181,7 +185,7 @@ static void l2x0_class_init(ObjectClass *klass, void = *data) } =20 static const TypeInfo l2x0_info =3D { - .name =3D "l2x0", + .name =3D TYPE_ARM_L2X0, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(L2x0State), .class_init =3D l2x0_class_init, --=20 1.8.1.4