david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xtensa_sim: Use cpu_xtensa_init() to obtain XtensaCPU

Browse Source 
Needed for sim_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
Andreas Färber 2012-05-04 19:26:57 +02:00
parent 15be317139
commit 06d26274cd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xtensa_sim.c
View File

@ -47,16 +47,19 @@ static void sim_init(ram_addr_t ram_size,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
XtensaCPU *cpu = NULL;
CPUXtensaState *env = NULL; CPUXtensaState *env = NULL;
MemoryRegion *ram, *rom; MemoryRegion *ram, *rom;
int n; int n;
for (n = 0; n < smp_cpus; n++) { for (n = 0; n < smp_cpus; n++) {
env = cpu_init(cpu_model); cpu = cpu_xtensa_init(cpu_model);
if (!env) { if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n"); fprintf(stderr, "Unable to find CPU definition\n");
exit(1); exit(1);
} }
env = &cpu->env;
env->sregs[PRID] = n; env->sregs[PRID] = n;
qemu_register_reset(sim_reset, env); qemu_register_reset(sim_reset, env);
/* Need MMU initialized prior to ELF loading, /* Need MMU initialized prior to ELF loading,