From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V336U-0006IW-1o for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:56:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V336S-0004U9-As for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:56:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33928 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V336S-0004Ti-3B for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:56:04 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 13:55:53 +0200 Message-Id: <1374926156-23050-4-git-send-email-afaerber@suse.de> In-Reply-To: <1374926156-23050-1-git-send-email-afaerber@suse.de> References: <1374926156-23050-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 3/6] sun4m: QOM cast cleanup for PROMState 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 e5c6881..b943a07 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -658,8 +658,12 @@ static const TypeInfo afx_info =3D { .class_init =3D afx_class_init, }; =20 +#define TYPE_OPENPROM "openprom" +#define OPENPROM(obj) OBJECT_CHECK(PROMState, (obj), TYPE_OPENPROM) + typedef struct PROMState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion prom; } PROMState; =20 @@ -677,7 +681,7 @@ static void prom_init(hwaddr addr, const char *bios_n= ame) char *filename; int ret; =20 - dev =3D qdev_create(NULL, "openprom"); + dev =3D qdev_create(NULL, TYPE_OPENPROM); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); =20 @@ -706,7 +710,7 @@ static void prom_init(hwaddr addr, const char *bios_n= ame) =20 static int prom_init1(SysBusDevice *dev) { - PROMState *s =3D FROM_SYSBUS(PROMState, dev); + PROMState *s =3D OPENPROM(dev); =20 memory_region_init_ram(&s->prom, OBJECT(s), "sun4m.prom", PROM_SIZE_= MAX); vmstate_register_ram_global(&s->prom); @@ -729,7 +733,7 @@ static void prom_class_init(ObjectClass *klass, void = *data) } =20 static const TypeInfo prom_info =3D { - .name =3D "openprom", + .name =3D TYPE_OPENPROM, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PROMState), .class_init =3D prom_class_init, --=20 1.8.1.4