Re: [Qemu-devel] [PATCH next v2 65/74] mips_jazz: Pass MIPSCPU to main_cpu_reset()

2012-05-11 Thread Andreas Färber
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 

Forgot:

Acked-by: Hervé Poussineau 

/-F

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg



[Qemu-devel] [PATCH next v2 65/74] mips_jazz: Pass MIPSCPU to main_cpu_reset()

2012-05-09 Thread Andreas Färber
Allows us to use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber 
---
 hw/mips_jazz.c |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)

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);
-- 
1.7.7