From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0G-0002QL-M0 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t09-0002H8-UF for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:08 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53251 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t09-0002H1-Ot for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:01 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 57C01A531D for ; Mon, 29 Jul 2013 21:21:01 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:06 +0200 Message-Id: <1375125630-24869-30-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 029/173] tcx: 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/tcx.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/display/tcx.c b/hw/display/tcx.c index 9fd48b5..24876d3 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -34,8 +34,12 @@ #define TCX_THC_NREGS_24 0x1000 #define TCX_TEC_NREGS 0x1000 =20 +#define TYPE_TCX "SUNW,tcx" +#define TCX(obj) OBJECT_CHECK(TCXState, (obj), TYPE_TCX) + typedef struct TCXState { - SysBusDevice busdev; + SysBusDevice parent_obj; + QemuConsole *con; uint8_t *vram; uint32_t *vram24, *cplane; @@ -423,7 +427,7 @@ static const VMStateDescription vmstate_tcx =3D { =20 static void tcx_reset(DeviceState *d) { - TCXState *s =3D container_of(d, TCXState, busdev.qdev); + TCXState *s =3D TCX(d); =20 /* Initialize palette */ memset(s->r, 0, 256); @@ -523,7 +527,7 @@ static const GraphicHwOps tcx24_ops =3D { =20 static int tcx_init1(SysBusDevice *dev) { - TCXState *s =3D FROM_SYSBUS(TCXState, dev); + TCXState *s =3D TCX(dev); ram_addr_t vram_offset =3D 0; int size; uint8_t *vram_base; @@ -609,7 +613,7 @@ static void tcx_class_init(ObjectClass *klass, void *= data) } =20 static const TypeInfo tcx_info =3D { - .name =3D "SUNW,tcx", + .name =3D TYPE_TCX, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(TCXState), .class_init =3D tcx_class_init, --=20 1.8.1.4