From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2b-0001vo-4d for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSH2Y-0005kG-4U for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:32 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35648 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2X-0005jb-T2 for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:30 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id CFA1E97BB4 for ; Thu, 10 May 2012 02:15:28 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 10 May 2012 02:14:46 +0200 Message-Id: <1336608892-30501-69-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 68/74] mips_mipssim: 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?= Needed for main_cpu_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/mips_mipssim.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c index 1ea7b58..7c510da 100644 --- a/hw/mips_mipssim.c +++ b/hw/mips_mipssim.c @@ -140,6 +140,7 @@ mips_mipssim_init (ram_addr_t ram_size, MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *ram =3D g_new(MemoryRegion, 1); MemoryRegion *bios =3D g_new(MemoryRegion, 1); + MIPSCPU *cpu; CPUMIPSState *env; ResetData *reset_info; int bios_size; @@ -152,11 +153,13 @@ mips_mipssim_init (ram_addr_t ram_size, 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; + reset_info =3D g_malloc0(sizeof(ResetData)); reset_info->env =3D env; reset_info->vector =3D env->active_tc.PC; --=20 1.7.7