From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2pec-0004Wy-BO for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2pea-0003qX-OU for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:26 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46365 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2pea-0003qO-Ib for qemu-devel@nongnu.org; Fri, 26 Jul 2013 17:34:24 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 1A3F6A52D7 for ; Fri, 26 Jul 2013 23:34:24 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 23:34:07 +0200 Message-Id: <1374874454-15549-8-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 07/14] lm32_sys: 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/lm32_sys.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/misc/lm32_sys.c b/hw/misc/lm32_sys.c index 060a5bf..9bdb781 100644 --- a/hw/misc/lm32_sys.c +++ b/hw/misc/lm32_sys.c @@ -44,8 +44,12 @@ enum { =20 #define MAX_TESTNAME_LEN 16 =20 +#define TYPE_LM32_SYS "lm32-sys" +#define LM32_SYS(obj) OBJECT_CHECK(LM32SysState, (obj), TYPE_LM32_SYS) + struct LM32SysState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; uint32_t base; uint32_t regs[R_MAX]; @@ -104,7 +108,7 @@ static const MemoryRegionOps sys_ops =3D { =20 static void sys_reset(DeviceState *d) { - LM32SysState *s =3D container_of(d, LM32SysState, busdev.qdev); + LM32SysState *s =3D LM32_SYS(d); int i; =20 for (i =3D 0; i < R_MAX; i++) { @@ -115,7 +119,7 @@ static void sys_reset(DeviceState *d) =20 static int lm32_sys_init(SysBusDevice *dev) { - LM32SysState *s =3D FROM_SYSBUS(typeof(*s), dev); + LM32SysState *s =3D LM32_SYS(dev); =20 memory_region_init_io(&s->iomem, OBJECT(dev), &sys_ops , s, "sys", R_MAX * 4); @@ -158,7 +162,7 @@ static void lm32_sys_class_init(ObjectClass *klass, v= oid *data) } =20 static const TypeInfo lm32_sys_info =3D { - .name =3D "lm32-sys", + .name =3D TYPE_LM32_SYS, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(LM32SysState), .class_init =3D lm32_sys_class_init, --=20 1.8.1.4