From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1V-0004oj-1H for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1J-0002jj-6p for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53464 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1I-0002je-Oz for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:12 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 5574BA5396 for ; Mon, 29 Jul 2013 21:22:12 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:29 +0200 Message-Id: <1375125630-24869-113-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 112/173] milkymist-pfpu: 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/misc/milkymist-pfpu.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c index 2b64ee7..b3b2143 100644 --- a/hw/misc/milkymist-pfpu.c +++ b/hw/misc/milkymist-pfpu.c @@ -116,8 +116,13 @@ static const char *opcode_to_str[] =3D { }; #endif =20 +#define TYPE_MILKYMIST_PFPU "milkymist-pfpu" +#define MILKYMIST_PFPU(obj) \ + OBJECT_CHECK(MilkymistPFPUState, (obj), TYPE_MILKYMIST_PFPU) + struct MilkymistPFPUState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion regs_region; CharDriverState *chr; qemu_irq irq; @@ -473,7 +478,7 @@ static const MemoryRegionOps pfpu_mmio_ops =3D { =20 static void milkymist_pfpu_reset(DeviceState *d) { - MilkymistPFPUState *s =3D container_of(d, MilkymistPFPUState, busdev= .qdev); + MilkymistPFPUState *s =3D MILKYMIST_PFPU(d); int i; =20 for (i =3D 0; i < R_MAX; i++) { @@ -493,7 +498,7 @@ static void milkymist_pfpu_reset(DeviceState *d) =20 static int milkymist_pfpu_init(SysBusDevice *dev) { - MilkymistPFPUState *s =3D FROM_SYSBUS(typeof(*s), dev); + MilkymistPFPUState *s =3D MILKYMIST_PFPU(dev); =20 sysbus_init_irq(dev, &s->irq); =20 @@ -530,7 +535,7 @@ static void milkymist_pfpu_class_init(ObjectClass *kl= ass, void *data) } =20 static const TypeInfo milkymist_pfpu_info =3D { - .name =3D "milkymist-pfpu", + .name =3D TYPE_MILKYMIST_PFPU, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MilkymistPFPUState), .class_init =3D milkymist_pfpu_class_init, --=20 1.8.1.4