aboutsummaryrefslogtreecommitdiff
path: root/hw/mips_malta.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-05 14:11:48 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:43 +0200
commit7688b134b8a47a615529b7caaae49da3cf91dcca (patch)
treebd163928ea0a270064a4ee6bf19e58925b2ec48d /hw/mips_malta.c
parentf37f435a3ea16d7d64a0971b40d2269020348d7b (diff)
mips_malta: Use cpu_mips_init() to obtain MIPSCPU
Needed for main_cpu_reset(). Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/mips_malta.c')
-rw-r--r--hw/mips_malta.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 4752bb2865..d81e8d57d5 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -788,6 +788,7 @@ void mips_malta_init (ram_addr_t ram_size,
int64_t kernel_entry;
PCIBus *pci_bus;
ISABus *isa_bus;
+ MIPSCPU *cpu;
CPUMIPSState *env;
qemu_irq *isa_irq;
qemu_irq *cpu_exit_irq;
@@ -825,11 +826,13 @@ void mips_malta_init (ram_addr_t ram_size,
}
for (i = 0; i < smp_cpus; i++) {
- env = cpu_init(cpu_model);
- if (!env) {
+ cpu = cpu_mips_init(cpu_model);
+ if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
}
+ env = &cpu->env;
+
/* Init internal devices */
cpu_mips_irq_init_cpu(env);
cpu_mips_clock_init(env);