diff mbox

[next,v2,65/74] mips_jazz: Pass MIPSCPU to main_cpu_reset()

Message ID 1336608892-30501-66-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_jazz.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

Comments

Andreas Färber May 11, 2012, 11:31 a.m. UTC | #1
Am 10.05.2012 02:14, schrieb Andreas Färber:
> Allows us to use cpu_reset() in place of cpu_state_reset().
> 
> Signed-off-by: Andreas Färber <afaerber@suse.de>

Forgot:

Acked-by: Hervé Poussineau <hpoussin@reactos.org>

/-F
diff mbox

Patch

diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 24959e0..bf1b799 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);