From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbeC-000546-NV for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTbdu-0007ak-Lp for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:40 -0400 Received: from cantor2.suse.de ([195.135.220.15]:43048 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbdu-0007ZB-Dt 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:35 +0200 Message-Id: <1381254296-3203-38-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 37/58] arm11mpcore: Create container MemoryRegion in instance_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook This allows to map the region directly after object initialization. Reviewed-by: Peter Maydell Signed-off-by: Andreas F=C3=A4rber --- hw/cpu/arm11mpcore.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c index 8719634..5f80e7b 100644 --- a/hw/cpu/arm11mpcore.c +++ b/hw/cpu/arm11mpcore.c @@ -90,8 +90,6 @@ static void mpcore_priv_map_setup(ARM11MPCorePriveState= *s) SysBusDevice *gicbusdev =3D SYS_BUS_DEVICE(s->gic); SysBusDevice *timerbusdev =3D SYS_BUS_DEVICE(s->mptimer); SysBusDevice *wdtbusdev =3D SYS_BUS_DEVICE(s->wdtimer); - memory_region_init(&s->container, OBJECT(s), - "mpcore-priv-container", 0x2000); memory_region_init_io(&s->iomem, OBJECT(s), &mpcore_scu_ops, s, "mpcore-scu", 0x100); memory_region_add_subregion(&s->container, 0, &s->iomem); @@ -155,10 +153,19 @@ static int mpcore_priv_init(SysBusDevice *sbd) qdev_init_nofail(s->wdtimer); =20 mpcore_priv_map_setup(s); - sysbus_init_mmio(sbd, &s->container); return 0; } =20 +static void mpcore_priv_initfn(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + ARM11MPCorePriveState *s =3D ARM11MPCORE_PRIV(obj); + + memory_region_init(&s->container, OBJECT(s), + "mpcore-priv-container", 0x2000); + sysbus_init_mmio(sbd, &s->container); +} + #define TYPE_REALVIEW_MPCORE_RIRQ "realview_mpcore" #define REALVIEW_MPCORE_RIRQ(obj) \ OBJECT_CHECK(mpcore_rirq_state, (obj), TYPE_REALVIEW_MPCORE_RIRQ) @@ -277,6 +284,7 @@ static const TypeInfo mpcore_priv_info =3D { .name =3D TYPE_ARM11MPCORE_PRIV, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ARM11MPCorePriveState), + .instance_init =3D mpcore_priv_initfn, .class_init =3D mpcore_priv_class_init, }; =20 --=20 1.8.1.4