From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37967) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbe9-00053r-6a for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTbdu-0007Yx-8p for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:37 -0400 Received: from cantor2.suse.de ([195.135.220.15]:43034 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbdt-0007Xa-Ti for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:22 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 8 Oct 2013 19:44:24 +0200 Message-Id: <1381254296-3203-27-git-send-email-afaerber@suse.de> In-Reply-To: <1381254296-3203-1-git-send-email-afaerber@suse.de> References: <1381254296-3203-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 26/58] arm_mptimer: Convert to QOM realize 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?= From: Andreas F=C3=A4rber Split the SysBusDevice initfn into instance_init and realizefn. Reviewed-by: Peter Maydell Signed-off-by: Andreas F=C3=A4rber --- hw/timer/arm_mptimer.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index 8020c9f..2853db4 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -225,8 +225,18 @@ static void arm_mptimer_reset(DeviceState *dev) } } =20 -static int arm_mptimer_init(SysBusDevice *dev) +static void arm_mptimer_init(Object *obj) { + ARMMPTimerState *s =3D ARM_MPTIMER(obj); + + memory_region_init_io(&s->iomem, obj, &arm_thistimer_ops, s, + "arm_mptimer_timer", 0x20); + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem); +} + +static void arm_mptimer_realize(DeviceState *dev, Error **errp) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); ARMMPTimerState *s =3D ARM_MPTIMER(dev); int i; =20 @@ -243,19 +253,14 @@ static int arm_mptimer_init(SysBusDevice *dev) * * timer for core 1 * and so on. */ - memory_region_init_io(&s->iomem, OBJECT(s), &arm_thistimer_ops, s, - "arm_mptimer_timer", 0x20); - sysbus_init_mmio(dev, &s->iomem); for (i =3D 0; i < s->num_cpu; i++) { TimerBlock *tb =3D &s->timerblock[i]; tb->timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, timerblock_tick, = tb); - sysbus_init_irq(dev, &tb->irq); + sysbus_init_irq(sbd, &tb->irq); memory_region_init_io(&tb->iomem, OBJECT(s), &timerblock_ops, tb= , "arm_mptimer_timerblock", 0x20); - sysbus_init_mmio(dev, &tb->iomem); + sysbus_init_mmio(sbd, &tb->iomem); } - - return 0; } =20 static const VMStateDescription vmstate_timerblock =3D { @@ -292,9 +297,8 @@ static Property arm_mptimer_properties[] =3D { static void arm_mptimer_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *sbc =3D SYS_BUS_DEVICE_CLASS(klass); =20 - sbc->init =3D arm_mptimer_init; + dc->realize =3D arm_mptimer_realize; dc->vmsd =3D &vmstate_arm_mptimer; dc->reset =3D arm_mptimer_reset; dc->no_user =3D 1; @@ -305,6 +309,7 @@ static const TypeInfo arm_mptimer_info =3D { .name =3D TYPE_ARM_MPTIMER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ARMMPTimerState), + .instance_init =3D arm_mptimer_init, .class_init =3D arm_mptimer_class_init, }; =20 --=20 1.8.1.4