From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0D-0002IV-4E for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t05-0002FR-VG for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53243 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t05-0002F5-P4 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:57 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 50983A531D for ; Mon, 29 Jul 2013 21:20:57 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:00 +0200 Message-Id: <1375125630-24869-24-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 023/173] g364fb: 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 and prepare for QOM realize. Signed-off-by: Andreas F=C3=A4rber --- hw/display/g364fb.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 2d3e912..7082171 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -493,26 +493,33 @@ static void g364fb_init(DeviceState *dev, G364State= *s) memory_region_set_coalescing(&s->mem_vram); } =20 +#define TYPE_G364 "sysbus-g364" +#define G364(obj) OBJECT_CHECK(G364SysBusState, (obj), TYPE_G364) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + G364State g364; } G364SysBusState; =20 -static int g364fb_sysbus_init(SysBusDevice *dev) +static int g364fb_sysbus_init(SysBusDevice *sbd) { - G364State *s =3D &FROM_SYSBUS(G364SysBusState, dev)->g364; + DeviceState *dev =3D DEVICE(sbd); + G364SysBusState *sbs =3D G364(dev); + G364State *s =3D &sbs->g364; =20 - g364fb_init(&dev->qdev, s); - sysbus_init_irq(dev, &s->irq); - sysbus_init_mmio(dev, &s->mem_ctrl); - sysbus_init_mmio(dev, &s->mem_vram); + g364fb_init(dev, s); + sysbus_init_irq(sbd, &s->irq); + sysbus_init_mmio(sbd, &s->mem_ctrl); + sysbus_init_mmio(sbd, &s->mem_vram); =20 return 0; } =20 static void g364fb_sysbus_reset(DeviceState *d) { - G364SysBusState *s =3D DO_UPCAST(G364SysBusState, busdev.qdev, d); + G364SysBusState *s =3D G364(d); + g364fb_reset(&s->g364); } =20 @@ -536,7 +543,7 @@ static void g364fb_sysbus_class_init(ObjectClass *kla= ss, void *data) } =20 static const TypeInfo g364fb_sysbus_info =3D { - .name =3D "sysbus-g364", + .name =3D TYPE_G364, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(G364SysBusState), .class_init =3D g364fb_sysbus_class_init, --=20 1.8.1.4