aboutsummaryrefslogtreecommitdiff
path: root/hw/mips_jazz.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-05 14:06:50 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:43 +0200
commitf37f435a3ea16d7d64a0971b40d2269020348d7b (patch)
tree2d270409a99715bb6de24f10e0d190bd6b863104 /hw/mips_jazz.c
parent6bd8da655a7a71487e22ea003e652b001fbd96f2 (diff)
mips_jazz: Pass MIPSCPU to main_cpu_reset()
Allows us to use cpu_reset() in place of cpu_state_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.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 24959e086d..bf1b799c4d 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -50,8 +50,9 @@ enum jazz_model_e
static void main_cpu_reset(void *opaque)
{
- CPUMIPSState *env = opaque;
- cpu_state_reset(env);
+ MIPSCPU *cpu = opaque;
+
+ cpu_reset(CPU(cpu));
}
static uint64_t rtc_read(void *opaque, target_phys_addr_t addr, unsigned size)
@@ -147,7 +148,7 @@ static void mips_jazz_init(MemoryRegion *address_space,
exit(1);
}
env = &cpu->env;
- qemu_register_reset(main_cpu_reset, env);
+ qemu_register_reset(main_cpu_reset, cpu);
/* allocate RAM */
memory_region_init_ram(ram, "mips_jazz.ram", ram_size);