From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0E-0002LX-B1 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t07-0002GA-Sp for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:06 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53248 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t07-0002Fz-JL for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:59 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 2A3F5A531D for ; Mon, 29 Jul 2013 21:20:59 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:03 +0200 Message-Id: <1375125630-24869-27-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 026/173] milkymist-vgafb: 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-vgafb.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c index 870b339..5150cb4 100644 --- a/hw/display/milkymist-vgafb.c +++ b/hw/display/milkymist-vgafb.c @@ -63,8 +63,13 @@ enum { CTRL_RESET =3D (1<<0), }; =20 +#define TYPE_MILKYMIST_VGAFB "milkymist-vgafb" +#define MILKYMIST_VGAFB(obj) \ + OBJECT_CHECK(MilkymistVgafbState, (obj), TYPE_MILKYMIST_VGAFB) + struct MilkymistVgafbState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion regs_region; QemuConsole *con; =20 @@ -84,6 +89,7 @@ static int vgafb_enabled(MilkymistVgafbState *s) static void vgafb_update_display(void *opaque) { MilkymistVgafbState *s =3D opaque; + SysBusDevice *sbd; DisplaySurface *surface =3D qemu_console_surface(s->con); int first =3D 0; int last =3D 0; @@ -93,6 +99,7 @@ static void vgafb_update_display(void *opaque) return; } =20 + sbd =3D SYS_BUS_DEVICE(s); int dest_width =3D s->regs[R_HRES]; =20 switch (surface_bits_per_pixel(surface)) { @@ -122,7 +129,7 @@ static void vgafb_update_display(void *opaque) break; } =20 - framebuffer_update_display(surface, sysbus_address_space(&s->busdev)= , + framebuffer_update_display(surface, sysbus_address_space(sbd), s->regs[R_BASEADDRESS] + s->fb_offset, s->regs[R_HRES], s->regs[R_VRES], @@ -256,7 +263,7 @@ static const MemoryRegionOps vgafb_mmio_ops =3D { =20 static void milkymist_vgafb_reset(DeviceState *d) { - MilkymistVgafbState *s =3D container_of(d, MilkymistVgafbState, busd= ev.qdev); + MilkymistVgafbState *s =3D MILKYMIST_VGAFB(d); int i; =20 for (i =3D 0; i < R_MAX; i++) { @@ -277,7 +284,7 @@ static const GraphicHwOps vgafb_ops =3D { =20 static int milkymist_vgafb_init(SysBusDevice *dev) { - MilkymistVgafbState *s =3D FROM_SYSBUS(typeof(*s), dev); + MilkymistVgafbState *s =3D MILKYMIST_VGAFB(dev); =20 memory_region_init_io(&s->regs_region, OBJECT(s), &vgafb_mmio_ops, s= , "milkymist-vgafb", R_MAX * 4); @@ -324,7 +331,7 @@ static void milkymist_vgafb_class_init(ObjectClass *k= lass, void *data) } =20 static const TypeInfo milkymist_vgafb_info =3D { - .name =3D "milkymist-vgafb", + .name =3D TYPE_MILKYMIST_VGAFB, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MilkymistVgafbState), .class_init =3D milkymist_vgafb_class_init, --=20 1.8.1.4