From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1SZh-0008EE-50 for qemu-devel@nongnu.org; Mon, 22 Jul 2013 22:43:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1SZe-0000t8-Qj for qemu-devel@nongnu.org; Mon, 22 Jul 2013 22:43:41 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49480 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1SZe-0000t3-Gg for qemu-devel@nongnu.org; Mon, 22 Jul 2013 22:43:38 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 23 Jul 2013 04:43:18 +0200 Message-Id: <1374547404-11700-11-git-send-email-afaerber@suse.de> In-Reply-To: <1374547404-11700-1-git-send-email-afaerber@suse.de> References: <1374547404-11700-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 v2 10/16] cpu/a9mpcore: Convert to QOM realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Paul Brook From: Andreas F=C3=A4rber Signed-off-by: Andreas F=C3=A4rber --- hw/cpu/a9mpcore.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c index 1dc1e92..5eb1a2f 100644 --- a/hw/cpu/a9mpcore.c +++ b/hw/cpu/a9mpcore.c @@ -59,38 +59,56 @@ static void a9mp_priv_initfn(Object *obj) qdev_set_parent_bus(DEVICE(&s->wdt), sysbus_get_default()); } =20 -static int a9mp_priv_init(SysBusDevice *dev) +static void a9mp_priv_realize(DeviceState *dev, Error **errp) { + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); A9MPPrivState *s =3D A9MPCORE_PRIV(dev); DeviceState *gicdev, *scudev, *mptimerdev, *wdtdev; SysBusDevice *timerbusdev, *wdtbusdev, *gicbusdev, *scubusdev; + Error *err =3D NULL; int i; =20 gicdev =3D DEVICE(&s->gic); qdev_prop_set_uint32(gicdev, "num-cpu", s->num_cpu); qdev_prop_set_uint32(gicdev, "num-irq", s->num_irq); - qdev_init_nofail(gicdev); + object_property_set_bool(OBJECT(&s->gic), true, "realized", &err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } gicbusdev =3D SYS_BUS_DEVICE(&s->gic); =20 /* Pass through outbound IRQ lines from the GIC */ - sysbus_pass_irq(dev, gicbusdev); + sysbus_pass_irq(sbd, gicbusdev); =20 /* Pass through inbound GPIO lines to the GIC */ - qdev_init_gpio_in(DEVICE(dev), a9mp_priv_set_irq, s->num_irq - 32); + qdev_init_gpio_in(dev, a9mp_priv_set_irq, s->num_irq - 32); =20 scudev =3D DEVICE(&s->scu); qdev_prop_set_uint32(scudev, "num-cpu", s->num_cpu); - qdev_init_nofail(scudev); + object_property_set_bool(OBJECT(&s->scu), true, "realized", &err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } scubusdev =3D SYS_BUS_DEVICE(&s->scu); =20 mptimerdev =3D DEVICE(&s->mptimer); qdev_prop_set_uint32(mptimerdev, "num-cpu", s->num_cpu); - qdev_init_nofail(mptimerdev); + object_property_set_bool(OBJECT(&s->mptimer), true, "realized", &err= ); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } timerbusdev =3D SYS_BUS_DEVICE(&s->mptimer); =20 wdtdev =3D DEVICE(&s->wdt); qdev_prop_set_uint32(wdtdev, "num-cpu", s->num_cpu); - qdev_init_nofail(wdtdev); + object_property_set_bool(OBJECT(&s->wdt), true, "realized", &err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } wdtbusdev =3D SYS_BUS_DEVICE(&s->wdt); =20 /* Memory map (addresses are offsets from PERIPHBASE): @@ -129,7 +147,6 @@ static int a9mp_priv_init(SysBusDevice *dev) sysbus_connect_irq(wdtbusdev, i, qdev_get_gpio_in(gicdev, ppibase + 30)); } - return 0; } =20 static Property a9mp_priv_properties[] =3D { @@ -147,9 +164,8 @@ static Property a9mp_priv_properties[] =3D { static void a9mp_priv_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D a9mp_priv_init; + dc->realize =3D a9mp_priv_realize; dc->props =3D a9mp_priv_properties; } =20 --=20 1.8.1.4