From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V28Ir-0000b1-Ua 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 1V28Ip-0001oj-6j for qemu-devel@nongnu.org; Wed, 24 Jul 2013 19:17:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:50935 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V28Ip-0001oN-01 for qemu-devel@nongnu.org; Wed, 24 Jul 2013 19:17:03 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 93E84A51FF for ; Thu, 25 Jul 2013 01:17:02 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 25 Jul 2013 01:16:47 +0200 Message-Id: <1374707812-21404-4-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 3/8] jazz_led: QOM cast cleanups 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?= Signed-off-by: Andreas F=C3=A4rber --- hw/display/jazz_led.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c index 7f82037..8407e6c 100644 --- a/hw/display/jazz_led.c +++ b/hw/display/jazz_led.c @@ -32,8 +32,12 @@ typedef enum { REDRAW_NONE =3D 0, REDRAW_SEGMENTS =3D 1, REDRAW_BACKGROUND =3D 2, } screen_state_t; =20 +#define TYPE_JAZZ_LED "jazz-led" +#define JAZZ_LED(obj) OBJECT_CHECK(LedState, (obj), TYPE_JAZZ_LED) + typedef struct LedState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; uint8_t segments; QemuConsole *con; @@ -262,7 +266,7 @@ static const GraphicHwOps jazz_led_ops =3D { =20 static int jazz_led_init(SysBusDevice *dev) { - LedState *s =3D FROM_SYSBUS(LedState, dev); + LedState *s =3D JAZZ_LED(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &led_ops, s, "led", 1); sysbus_init_mmio(dev, &s->iomem); @@ -274,7 +278,7 @@ static int jazz_led_init(SysBusDevice *dev) =20 static void jazz_led_reset(DeviceState *d) { - LedState *s =3D DO_UPCAST(LedState, busdev.qdev, d); + LedState *s =3D JAZZ_LED(d); =20 s->segments =3D 0; s->state =3D REDRAW_SEGMENTS | REDRAW_BACKGROUND; @@ -293,7 +297,7 @@ static void jazz_led_class_init(ObjectClass *klass, v= oid *data) } =20 static const TypeInfo jazz_led_info =3D { - .name =3D "jazz-led", + .name =3D TYPE_JAZZ_LED, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(LedState), .class_init =3D jazz_led_class_init, --=20 1.8.1.4