From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0D-0002K2-NX for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t07-0002Fr-6V for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53247 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t06-0002Fe-VT for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:59 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 86628A531D for ; Mon, 29 Jul 2013 21:20:58 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:02 +0200 Message-Id: <1375125630-24869-26-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 025/173] milkymist-tmu2: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Introduce a type constant, use QOM casts and rename the parent field. Signed-off-by: Andreas F=C3=A4rber --- hw/display/milkymist-tmu2.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index efda082..b2a5fba 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -75,8 +75,13 @@ struct vertex { int y; } QEMU_PACKED; =20 +#define TYPE_MILKYMIST_TMU2 "milkymist-tmu2" +#define MILKYMIST_TMU2(obj) \ + OBJECT_CHECK(MilkymistTMU2State, (obj), TYPE_MILKYMIST_TMU2) + struct MilkymistTMU2State { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion regs_region; CharDriverState *chr; qemu_irq irq; @@ -429,7 +434,7 @@ static const MemoryRegionOps tmu2_mmio_ops =3D { =20 static void milkymist_tmu2_reset(DeviceState *d) { - MilkymistTMU2State *s =3D container_of(d, MilkymistTMU2State, busdev= .qdev); + MilkymistTMU2State *s =3D MILKYMIST_TMU2(d); int i; =20 for (i =3D 0; i < R_MAX; i++) { @@ -439,7 +444,7 @@ static void milkymist_tmu2_reset(DeviceState *d) =20 static int milkymist_tmu2_init(SysBusDevice *dev) { - MilkymistTMU2State *s =3D FROM_SYSBUS(typeof(*s), dev); + MilkymistTMU2State *s =3D MILKYMIST_TMU2(dev); =20 if (tmu2_glx_init(s)) { return 1; @@ -476,7 +481,7 @@ static void milkymist_tmu2_class_init(ObjectClass *kl= ass, void *data) } =20 static const TypeInfo milkymist_tmu2_info =3D { - .name =3D "milkymist-tmu2", + .name =3D TYPE_MILKYMIST_TMU2, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MilkymistTMU2State), .class_init =3D milkymist_tmu2_class_init, --=20 1.8.1.4