diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-05 14:05:42 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:43 +0200 |
| commit | 6bd8da655a7a71487e22ea003e652b001fbd96f2 (patch) | |
| tree | 7def57482acdd19ae2c3133bf5d47f659454c2ac /hw/mips_jazz.c | |
| parent | 800cf598f98db86da7b30359ae8b173a1efc1cea (diff) | |
| download | focaccia-qemu-6bd8da655a7a71487e22ea003e652b001fbd96f2.tar.gz focaccia-qemu-6bd8da655a7a71487e22ea003e652b001fbd96f2.zip | |
mips_jazz: Use cpu_mips_init() to obtain MIPSCPU
Needed for main_cpu_reset(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Hervé Poussineau <hpoussin@reactos.org>
Diffstat (limited to 'hw/mips_jazz.c')
| -rw-r--r-- | hw/mips_jazz.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index a6bc7badff..24959e086d 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -112,6 +112,7 @@ static void mips_jazz_init(MemoryRegion *address_space, { char *filename; int bios_size, n; + MIPSCPU *cpu; CPUMIPSState *env; qemu_irq *rc4030, *i8259; rc4030_dma *dmas; @@ -140,11 +141,12 @@ static void mips_jazz_init(MemoryRegion *address_space, cpu_model = "24Kf"; #endif } - 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; qemu_register_reset(main_cpu_reset, env); /* allocate RAM */ |