From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VX-0001aW-55 for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3VU-0000vL-81 for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:22 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55442 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VT-0000uS-OA for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:20 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:35:04 +0200 Message-Id: <1336318514-30906-65-git-send-email-afaerber@suse.de> In-Reply-To: <1336318514-30906-1-git-send-email-afaerber@suse.de> References: <1336318514-30906-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 for-next 64/74] mips_jazz: 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: Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Needed for main_cpu_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/mips_jazz.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index a6bc7ba..24959e0 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -112,6 +112,7 @@ static void mips_jazz_init(MemoryRegion *address_spac= e, { char *filename; int bios_size, n; + MIPSCPU *cpu; CPUMIPSState *env; qemu_irq *rc4030, *i8259; rc4030_dma *dmas; @@ -140,11 +141,12 @@ static void mips_jazz_init(MemoryRegion *address_sp= ace, cpu_model =3D "24Kf"; #endif } - 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; qemu_register_reset(main_cpu_reset, env); =20 /* allocate RAM */ --=20 1.7.7