From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1m-0004xI-9c for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1a-0002qO-M5 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:42 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53504 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1a-0002qG-5m for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:30 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:53 +0200 Message-Id: <1375125630-24869-137-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-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] [PULL 136/173] sun4m: QOM cast cleanup for AFXState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/sparc/sun4m.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index eb3b11b..e5c6881 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -612,8 +612,12 @@ static const TypeInfo idreg_info =3D { .class_init =3D idreg_class_init, }; =20 +#define TYPE_TCX_AFX "tcx_afx" +#define TCX_AFX(obj) OBJECT_CHECK(AFXState, (obj), TYPE_TCX_AFX) + typedef struct AFXState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion mem; } AFXState; =20 @@ -623,7 +627,7 @@ static void afx_init(hwaddr addr) DeviceState *dev; SysBusDevice *s; =20 - dev =3D qdev_create(NULL, "tcx_afx"); + dev =3D qdev_create(NULL, TYPE_TCX_AFX); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); =20 @@ -632,7 +636,7 @@ static void afx_init(hwaddr addr) =20 static int afx_init1(SysBusDevice *dev) { - AFXState *s =3D FROM_SYSBUS(AFXState, dev); + AFXState *s =3D TCX_AFX(dev); =20 memory_region_init_ram(&s->mem, OBJECT(s), "sun4m.afx", 4); vmstate_register_ram_global(&s->mem); @@ -648,7 +652,7 @@ static void afx_class_init(ObjectClass *klass, void *= data) } =20 static const TypeInfo afx_info =3D { - .name =3D "tcx_afx", + .name =3D TYPE_TCX_AFX, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(AFXState), .class_init =3D afx_class_init, --=20 1.8.1.4