diff mbox

[next,v2,63/74] mips_fulong2e: Pass MIPSCPU to main_cpu_reset()

Message ID 1336608892-30501-64-git-send-email-afaerber@suse.de
State New
Headers show

Commit Message

Andreas Färber May 10, 2012, 12:14 a.m. UTC 
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/mips_fulong2e.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 8b66e7b..9a12a76 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -198,9 +198,10 @@  static void write_bootloader (CPUMIPSState *env, uint8_t *base, int64_t kernel_a
 
 static void main_cpu_reset(void *opaque)
 {
-    CPUMIPSState *env = opaque;
+    MIPSCPU *cpu = opaque;
+    CPUMIPSState *env = &cpu->env;
 
-    cpu_state_reset(env);
+    cpu_reset(CPU(cpu));
     /* TODO: 2E reset stuff */
     if (loaderparams.kernel_filename) {
         env->CP0_Status &= ~((1 << CP0St_BEV) | (1 << CP0St_ERL));
@@ -287,7 +288,7 @@  static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device,
     env = &cpu->env;
 
     register_savevm(NULL, "cpu", 0, 3, cpu_save, cpu_load, env);
-    qemu_register_reset(main_cpu_reset, env);
+    qemu_register_reset(main_cpu_reset, cpu);
 
     /* fulong 2e has 256M ram. */
     ram_size = 256 * 1024 * 1024;