From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t26-0005L0-MX for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:23:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1s-0002wo-Jw for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:23:02 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53543 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1s-0002wQ-Dp for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:48 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id F325DA531D for ; Mon, 29 Jul 2013 21:22:47 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:20:13 +0200 Message-Id: <1375125630-24869-157-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 156/173] milkymist-sysctl: 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/timer/milkymist-sysctl.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index 5009394..94246e5 100644 --- a/hw/timer/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c @@ -57,8 +57,13 @@ enum { R_MAX }; =20 +#define TYPE_MILKYMIST_SYSCTL "milkymist-sysctl" +#define MILKYMIST_SYSCTL(obj) \ + OBJECT_CHECK(MilkymistSysctlState, (obj), TYPE_MILKYMIST_SYSCTL) + struct MilkymistSysctlState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion regs_region; =20 QEMUBH *bh0; @@ -246,8 +251,7 @@ static void timer1_hit(void *opaque) =20 static void milkymist_sysctl_reset(DeviceState *d) { - MilkymistSysctlState *s =3D - container_of(d, MilkymistSysctlState, busdev.qdev); + MilkymistSysctlState *s =3D MILKYMIST_SYSCTL(d); int i; =20 for (i =3D 0; i < R_MAX; i++) { @@ -267,7 +271,7 @@ static void milkymist_sysctl_reset(DeviceState *d) =20 static int milkymist_sysctl_init(SysBusDevice *dev) { - MilkymistSysctlState *s =3D FROM_SYSBUS(typeof(*s), dev); + MilkymistSysctlState *s =3D MILKYMIST_SYSCTL(dev); =20 sysbus_init_irq(dev, &s->gpio_irq); sysbus_init_irq(dev, &s->timer0_irq); @@ -324,7 +328,7 @@ static void milkymist_sysctl_class_init(ObjectClass *= klass, void *data) } =20 static const TypeInfo milkymist_sysctl_info =3D { - .name =3D "milkymist-sysctl", + .name =3D TYPE_MILKYMIST_SYSCTL, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MilkymistSysctlState), .class_init =3D milkymist_sysctl_class_init, --=20 1.8.1.4