From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1q-0004xY-5V for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1d-0002rL-Gk for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:46 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53512 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1d-0002rB-AW for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:33 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:57 +0200 Message-Id: <1375125630-24869-141-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 140/173] sun4u: 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/sparc64/sun4u.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 9568028..a7214a3 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -714,9 +714,12 @@ static const TypeInfo prom_info =3D { }; =20 =20 -typedef struct RamDevice -{ - SysBusDevice busdev; +#define TYPE_SUN4U_MEMORY "memory" +#define SUN4U_RAM(obj) OBJECT_CHECK(RamDevice, (obj), TYPE_SUN4U_MEMORY) + +typedef struct RamDevice { + SysBusDevice parent_obj; + MemoryRegion ram; uint64_t size; } RamDevice; @@ -724,7 +727,7 @@ typedef struct RamDevice /* System RAM */ static int ram_init1(SysBusDevice *dev) { - RamDevice *d =3D FROM_SYSBUS(RamDevice, dev); + RamDevice *d =3D SUN4U_RAM(dev); =20 memory_region_init_ram(&d->ram, OBJECT(d), "sun4u.ram", d->size); vmstate_register_ram_global(&d->ram); @@ -739,10 +742,10 @@ static void ram_init(hwaddr addr, ram_addr_t RAM_si= ze) RamDevice *d; =20 /* allocate RAM */ - dev =3D qdev_create(NULL, "memory"); + dev =3D qdev_create(NULL, TYPE_SUN4U_MEMORY); s =3D SYS_BUS_DEVICE(dev); =20 - d =3D FROM_SYSBUS(RamDevice, s); + d =3D SUN4U_RAM(dev); d->size =3D RAM_size; qdev_init_nofail(dev); =20 @@ -764,7 +767,7 @@ static void ram_class_init(ObjectClass *klass, void *= data) } =20 static const TypeInfo ram_info =3D { - .name =3D "memory", + .name =3D TYPE_SUN4U_MEMORY, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(RamDevice), .class_init =3D ram_class_init, --=20 1.8.1.4