From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2Z-0001qj-EP for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSH2X-0005ji-7b for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:30 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35644 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2X-0005jA-17 for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:29 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 10 May 2012 02:14:44 +0200 Message-Id: <1336608892-30501-67-git-send-email-afaerber@suse.de> In-Reply-To: <1336608892-30501-1-git-send-email-afaerber@suse.de> References: <1336608892-30501-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 next v2 66/74] mips_malta: Use cpu_mips_init() to obtain MIPSCPU 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?= , Aurelien Jarno Needed for main_cpu_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/mips_malta.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 4752bb2..d81e8d5 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -788,6 +788,7 @@ void mips_malta_init (ram_addr_t ram_size, int64_t kernel_entry; PCIBus *pci_bus; ISABus *isa_bus; + MIPSCPU *cpu; CPUMIPSState *env; qemu_irq *isa_irq; qemu_irq *cpu_exit_irq; @@ -825,11 +826,13 @@ void mips_malta_init (ram_addr_t ram_size, } =20 for (i =3D 0; i < smp_cpus; i++) { - env =3D cpu_init(cpu_model); - if (!env) { + cpu =3D cpu_mips_init(cpu_model); + if (cpu =3D=3D NULL) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } + env =3D &cpu->env; + /* Init internal devices */ cpu_mips_irq_init_cpu(env); cpu_mips_clock_init(env); --=20 1.7.7