From f37f435a3ea16d7d64a0971b40d2269020348d7b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20F=C3=A4rber?= Date: Sat, 5 May 2012 14:06:50 +0200 Subject: [PATCH] mips_jazz: Pass MIPSCPU to main_cpu_reset() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Allows us to use cpu_reset() in place of cpu_state_reset(). Signed-off-by: Andreas Färber Acked-by: Hervé Poussineau --- hw/mips_jazz.c | 7 ++++--- 1 file 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); -- 2.7.4