From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34573) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJlYP-0005fT-OB for qemu-devel@nongnu.org; Wed, 11 Sep 2013 10:38:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJlYG-0005dk-T4 for qemu-devel@nongnu.org; Wed, 11 Sep 2013 10:38:01 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45122 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJlYG-0005cv-Ee for qemu-devel@nongnu.org; Wed, 11 Sep 2013 10:37:52 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 11 Sep 2013 16:37:26 +0200 Message-Id: <1378910260-7688-11-git-send-email-afaerber@suse.de> In-Reply-To: <1378910260-7688-1-git-send-email-afaerber@suse.de> References: <1378910260-7688-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 v4 10/24] a15mpcore: Split off 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 From: Andreas F=C3=A4rber Prepares for QOM realize. Signed-off-by: Andreas F=C3=A4rber --- hw/cpu/a15mpcore.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index 9abba67..af29c35 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -44,6 +44,15 @@ static void a15mp_priv_set_irq(void *opaque, int irq, = int level) qemu_set_irq(qdev_get_gpio_in(s->gic, irq), level); } =20 +static void a15mp_priv_initfn(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + A15MPPrivState *s =3D A15MPCORE_PRIV(obj); + + memory_region_init(&s->container, obj, "a15mp-priv-container", 0x800= 0); + sysbus_init_mmio(sbd, &s->container); +} + static int a15mp_priv_init(SysBusDevice *dev) { A15MPPrivState *s =3D A15MPCORE_PRIV(dev); @@ -92,14 +101,11 @@ static int a15mp_priv_init(SysBusDevice *dev) * 0x5000-0x5fff -- GIC virtual interface control (not modelled) * 0x6000-0x7fff -- GIC virtual CPU interface (not modelled) */ - memory_region_init(&s->container, OBJECT(s), - "a15mp-priv-container", 0x8000); memory_region_add_subregion(&s->container, 0x1000, sysbus_mmio_get_region(busdev, 0)); memory_region_add_subregion(&s->container, 0x2000, sysbus_mmio_get_region(busdev, 1)); =20 - sysbus_init_mmio(dev, &s->container); return 0; } =20 @@ -128,6 +134,7 @@ static const TypeInfo a15mp_priv_info =3D { .name =3D TYPE_A15MPCORE_PRIV, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(A15MPPrivState), + .instance_init =3D a15mp_priv_initfn, .class_init =3D a15mp_priv_class_init, }; =20 --=20 1.8.1.4