From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1l-0004xD-Sx for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1Z-0002qB-MZ for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:41 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53502 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1Z-0002q3-GN for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:29 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:52 +0200 Message-Id: <1375125630-24869-136-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 135/173] sun4m: QOM cast cleanup for IDRegState 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 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 5c7bd31..eb3b11b 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -559,6 +559,9 @@ static void tcx_init(hwaddr addr, int vram_size, int = width, } =20 /* NCR89C100/MACIO Internal ID register */ + +#define TYPE_MACIO_ID_REGISTER "macio_idreg" + static const uint8_t idreg_data[] =3D { 0xfe, 0x81, 0x01, 0x03 }; =20 static void idreg_init(hwaddr addr) @@ -566,7 +569,7 @@ static void idreg_init(hwaddr addr) DeviceState *dev; SysBusDevice *s; =20 - dev =3D qdev_create(NULL, "macio_idreg"); + dev =3D qdev_create(NULL, TYPE_MACIO_ID_REGISTER); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); =20 @@ -574,14 +577,18 @@ static void idreg_init(hwaddr addr) cpu_physical_memory_write_rom(addr, idreg_data, sizeof(idreg_data)); } =20 +#define MACIO_ID_REGISTER(obj) \ + OBJECT_CHECK(IDRegState, (obj), TYPE_MACIO_ID_REGISTER) + typedef struct IDRegState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion mem; } IDRegState; =20 static int idreg_init1(SysBusDevice *dev) { - IDRegState *s =3D FROM_SYSBUS(IDRegState, dev); + IDRegState *s =3D MACIO_ID_REGISTER(dev); =20 memory_region_init_ram(&s->mem, OBJECT(s), "sun4m.idreg", sizeof(idreg_data)); @@ -599,7 +606,7 @@ static void idreg_class_init(ObjectClass *klass, void= *data) } =20 static const TypeInfo idreg_info =3D { - .name =3D "macio_idreg", + .name =3D TYPE_MACIO_ID_REGISTER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(IDRegState), .class_init =3D idreg_class_init, --=20 1.8.1.4