From 06d26274cdd2f3ce79ba91dbf2dd0f535cbabd3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20F=C3=A4rber?= Date: Fri, 4 May 2012 19:26:57 +0200 Subject: [PATCH] xtensa_sim: Use cpu_xtensa_init() to obtain XtensaCPU MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Needed for sim_reset(). Signed-off-by: Andreas Färber Acked-by: Max Filippov --- hw/xtensa_sim.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c index c7e05dcf4e..dae08a1212 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 = NULL; CPUXtensaState *env = NULL; MemoryRegion *ram, *rom; int n; for (n = 0; n < smp_cpus; n++) { - env = cpu_init(cpu_model); - if (!env) { + cpu = cpu_xtensa_init(cpu_model); + if (cpu == NULL) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } + env = &cpu->env; + env->sregs[PRID] = n; qemu_register_reset(sim_reset, env); /* Need MMU initialized prior to ELF loading, -- 2.11.0