From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V28Is-0000b5-0w for qemu-devel@nongnu.org; Wed, 24 Jul 2013 19:17:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V28Io-0001od-Vy for qemu-devel@nongnu.org; Wed, 24 Jul 2013 19:17:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:50932 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V28Io-0001oF-Mv for qemu-devel@nongnu.org; Wed, 24 Jul 2013 19:17:02 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 25 Jul 2013 01:16:45 +0200 Message-Id: <1374707812-21404-2-git-send-email-afaerber@suse.de> In-Reply-To: <1374707812-21404-1-git-send-email-afaerber@suse.de> References: <1374707812-21404-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] [PATCH qom-next for-1.6 1/8] exynos4210_fimd: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Maksim Kozlov , Igor Mitsyanko , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Evgeny Voevodin , Dmitry Solodkiy Signed-off-by: Andreas F=C3=A4rber --- hw/display/exynos4210_fimd.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index eb168ea..65cca1d 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -292,8 +292,13 @@ struct Exynos4210fimdWindow { hwaddr fb_len; /* Framebuffer length */ }; =20 +#define TYPE_EXYNOS4210_FIMD "exynos4210.fimd" +#define EXYNOS4210_FIMD(obj) \ + OBJECT_CHECK(Exynos4210fimdState, (obj), TYPE_EXYNOS4210_FIMD) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; QemuConsole *console; qemu_irq irq[3]; @@ -1108,6 +1113,7 @@ static inline int fimd_get_buffer_id(Exynos4210fimd= Window *w) * VIDOSDA, VIDOSDB, VIDWADDx and SHADOWCON registers */ static void fimd_update_memory_section(Exynos4210fimdState *s, unsigned = win) { + SysBusDevice *sbd =3D SYS_BUS_DEVICE(s); Exynos4210fimdWindow *w =3D &s->window[win]; hwaddr fb_start_addr, fb_mapped_len; =20 @@ -1131,8 +1137,8 @@ static void fimd_update_memory_section(Exynos4210fi= mdState *s, unsigned win) * does not support hot-unplug. */ memory_region_unref(w->mem_section.mr); - w->mem_section =3D memory_region_find(sysbus_address_space(&s->busde= v), - fb_start_addr, w->fb_len); + w->mem_section =3D memory_region_find(sysbus_address_space(sbd), + fb_start_addr, w->fb_len); assert(w->mem_section.mr); assert(w->mem_section.offset_within_address_space =3D=3D fb_start_ad= dr); DPRINT_TRACE("Window %u framebuffer changed: address=3D0x%08x, len=3D= 0x%x\n", @@ -1328,7 +1334,7 @@ static void exynos4210_fimd_update(void *opaque) =20 static void exynos4210_fimd_reset(DeviceState *d) { - Exynos4210fimdState *s =3D DO_UPCAST(Exynos4210fimdState, busdev.qde= v, d); + Exynos4210fimdState *s =3D EXYNOS4210_FIMD(d); unsigned w; =20 DPRINT_TRACE("Display controller reset\n"); @@ -1900,7 +1906,7 @@ static const GraphicHwOps exynos4210_fimd_ops =3D { =20 static int exynos4210_fimd_init(SysBusDevice *dev) { - Exynos4210fimdState *s =3D FROM_SYSBUS(Exynos4210fimdState, dev); + Exynos4210fimdState *s =3D EXYNOS4210_FIMD(dev); =20 s->ifb =3D NULL; =20 @@ -1927,7 +1933,7 @@ static void exynos4210_fimd_class_init(ObjectClass = *klass, void *data) } =20 static const TypeInfo exynos4210_fimd_info =3D { - .name =3D "exynos4210.fimd", + .name =3D TYPE_EXYNOS4210_FIMD, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(Exynos4210fimdState), .class_init =3D exynos4210_fimd_class_init, --=20 1.8.1.4