haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mips_jazz: Use cpu_mips_init() to obtain MIPSCPU

Browse source 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Hervé Poussineau <hpoussin@reactos.org>
This commit is contained in:
Andreas Färber 2012-05-05 14:05:42 +02:00
parent 800cf598f9
commit 6bd8da655a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/mips_jazz.c
View file

@ -112,6 +112,7 @@ static void mips_jazz_init(MemoryRegion *address_space,
{ {
char *filename; char *filename;
int bios_size, n; int bios_size, n;
MIPSCPU *cpu;
CPUMIPSState *env; CPUMIPSState *env;
qemu_irq *rc4030, *i8259; qemu_irq *rc4030, *i8259;
rc4030_dma *dmas; rc4030_dma *dmas;
@ -140,11 +141,12 @@ static void mips_jazz_init(MemoryRegion *address_space,
cpu_model = "24Kf"; cpu_model = "24Kf";
#endif #endif
} }
env = cpu_init(cpu_model); cpu = cpu_mips_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;
qemu_register_reset(main_cpu_reset, env); qemu_register_reset(main_cpu_reset, env);
/* allocate RAM */ /* allocate RAM */