From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VN-000126-15 for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3VK-0000pV-VW for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55378 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VK-0000od-QG for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:10 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:47 +0200 Message-Id: <1336318514-30906-48-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 47/74] xtensa_sim: Use cpu_xtensa_init() to obtain XtensaCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , Max Filippov Needed for sim_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/xtensa_sim.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c index c7e05dc..dae08a1 100644 --- a/hw/xtensa_sim.c +++ b/hw/xtensa_sim.c @@ -47,16 +47,19 @@ static void sim_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { + XtensaCPU *cpu =3D NULL; CPUXtensaState *env =3D NULL; MemoryRegion *ram, *rom; int n; =20 for (n =3D 0; n < smp_cpus; n++) { - env =3D cpu_init(cpu_model); - if (!env) { + cpu =3D cpu_xtensa_init(cpu_model); + if (cpu =3D=3D NULL) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } + env =3D &cpu->env; + env->sregs[PRID] =3D n; qemu_register_reset(sim_reset, env); /* Need MMU initialized prior to ELF loading, --=20 1.7.7