From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0t-0003fq-H7 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0n-0002V9-33 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:47 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53386 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0m-0002Up-Ss for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:41 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 74887A531D for ; Mon, 29 Jul 2013 21:21:40 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:46 +0200 Message-Id: <1375125630-24869-70-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 069/173] milkymist-uart: 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?= Signed-off-by: Andreas F=C3=A4rber --- hw/char/milkymist-uart.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index 46deab2..2e4b5c5 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -52,8 +52,13 @@ enum { DBG_BREAK_EN =3D (1<<0), }; =20 +#define TYPE_MILKYMIST_UART "milkymist-uart" +#define MILKYMIST_UART(obj) \ + OBJECT_CHECK(MilkymistUartState, (obj), TYPE_MILKYMIST_UART) + struct MilkymistUartState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion regs_region; CharDriverState *chr; qemu_irq irq; @@ -179,7 +184,7 @@ static void uart_event(void *opaque, int event) =20 static void milkymist_uart_reset(DeviceState *d) { - MilkymistUartState *s =3D container_of(d, MilkymistUartState, busdev= .qdev); + MilkymistUartState *s =3D MILKYMIST_UART(d); int i; =20 for (i =3D 0; i < R_MAX; i++) { @@ -192,12 +197,12 @@ static void milkymist_uart_reset(DeviceState *d) =20 static int milkymist_uart_init(SysBusDevice *dev) { - MilkymistUartState *s =3D FROM_SYSBUS(typeof(*s), dev); + MilkymistUartState *s =3D MILKYMIST_UART(dev); =20 sysbus_init_irq(dev, &s->irq); =20 memory_region_init_io(&s->regs_region, OBJECT(s), &uart_mmio_ops, s, - "milkymist-uart", R_MAX * 4); + "milkymist-uart", R_MAX * 4); sysbus_init_mmio(dev, &s->regs_region); =20 s->chr =3D qemu_char_get_next_serial(); @@ -230,7 +235,7 @@ static void milkymist_uart_class_init(ObjectClass *kl= ass, void *data) } =20 static const TypeInfo milkymist_uart_info =3D { - .name =3D "milkymist-uart", + .name =3D TYPE_MILKYMIST_UART, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MilkymistUartState), .class_init =3D milkymist_uart_class_init, --=20 1.8.1.4