From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8G-000580-9A for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STz8B-0000cN-Va for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:27 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49640 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8B-0000ar-NK for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:23 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 14 May 2012 19:32:04 +0200 Message-Id: <1337016729-12285-18-git-send-email-afaerber@suse.de> In-Reply-To: <1337016729-12285-1-git-send-email-afaerber@suse.de> References: <1337016729-12285-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 qom-next 17/22] vexpress: Use cpu_arm_init() to obtain ARMCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Needed for arm_pic_init_cpu(). Signed-off-by: Andreas F=C3=A4rber --- hw/vexpress.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/vexpress.c b/hw/vexpress.c index 8b0ca42..4797c6a 100644 --- a/hw/vexpress.c +++ b/hw/vexpress.c @@ -159,7 +159,6 @@ static void a9_daughterboard_init(const VEDBoardInfo = *daughterboard, const char *cpu_model, qemu_irq *pic, uint32_t *proc_id) { - CPUARMState *env =3D NULL; MemoryRegion *sysmem =3D get_system_memory(); MemoryRegion *ram =3D g_new(MemoryRegion, 1); MemoryRegion *lowram =3D g_new(MemoryRegion, 1); @@ -177,12 +176,12 @@ static void a9_daughterboard_init(const VEDBoardInf= o *daughterboard, *proc_id =3D 0x0c000191; =20 for (n =3D 0; n < smp_cpus; n++) { - env =3D cpu_init(cpu_model); - if (!env) { + ARMCPU *cpu =3D cpu_arm_init(cpu_model); + if (!cpu) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } - irqp =3D arm_pic_init_cpu(env); + irqp =3D arm_pic_init_cpu(&cpu->env); cpu_irq[n] =3D irqp[ARM_PIC_CPU_IRQ]; } =20 @@ -259,7 +258,6 @@ static void a15_daughterboard_init(const VEDBoardInfo= *daughterboard, qemu_irq *pic, uint32_t *proc_id) { int n; - CPUARMState *env =3D NULL; MemoryRegion *sysmem =3D get_system_memory(); MemoryRegion *ram =3D g_new(MemoryRegion, 1); MemoryRegion *sram =3D g_new(MemoryRegion, 1); @@ -274,13 +272,15 @@ static void a15_daughterboard_init(const VEDBoardIn= fo *daughterboard, *proc_id =3D 0x14000217; =20 for (n =3D 0; n < smp_cpus; n++) { + ARMCPU *cpu; qemu_irq *irqp; - env =3D cpu_init(cpu_model); - if (!env) { + + cpu =3D cpu_arm_init(cpu_model); + if (!cpu) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } - irqp =3D arm_pic_init_cpu(env); + irqp =3D arm_pic_init_cpu(&cpu->env); cpu_irq[n] =3D irqp[ARM_PIC_CPU_IRQ]; } =20 --=20 1.7.7