From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V336T-0006IR-K5 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:56:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V336S-0004Tt-8x for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:56:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33923 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V336S-0004Ta-1a 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:54 +0200 Message-Id: <1374926156-23050-5-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 4/6] sun4m: QOM cast cleanup for RamDevice 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, 9 insertions(+), 6 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index b943a07..942ca37 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -739,9 +739,12 @@ static const TypeInfo prom_info =3D { .class_init =3D prom_class_init, }; =20 -typedef struct RamDevice -{ - SysBusDevice busdev; +#define TYPE_SUN4M_MEMORY "memory" +#define SUN4M_RAM(obj) OBJECT_CHECK(RamDevice, (obj), TYPE_SUN4M_MEMORY) + +typedef struct RamDevice { + SysBusDevice parent_obj; + MemoryRegion ram; uint64_t size; } RamDevice; @@ -749,7 +752,7 @@ typedef struct RamDevice /* System RAM */ static int ram_init1(SysBusDevice *dev) { - RamDevice *d =3D FROM_SYSBUS(RamDevice, dev); + RamDevice *d =3D SUN4M_RAM(dev); =20 memory_region_init_ram(&d->ram, OBJECT(d), "sun4m.ram", d->size); vmstate_register_ram_global(&d->ram); @@ -775,7 +778,7 @@ static void ram_init(hwaddr addr, ram_addr_t RAM_size= , dev =3D qdev_create(NULL, "memory"); s =3D SYS_BUS_DEVICE(dev); =20 - d =3D FROM_SYSBUS(RamDevice, s); + d =3D SUN4M_RAM(dev); d->size =3D RAM_size; qdev_init_nofail(dev); =20 @@ -797,7 +800,7 @@ static void ram_class_init(ObjectClass *klass, void *= data) } =20 static const TypeInfo ram_info =3D { - .name =3D "memory", + .name =3D TYPE_SUN4M_MEMORY, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(RamDevice), .class_init =3D ram_class_init, --=20 1.8.1.4