From: Andreas Färber <afaerber@suse.de>
Date: Sat, 5 May 2012 11:06:10 +0000 (+0200)
Subject: target-mips: Use cpu_reset() in cpu_mips_init()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3bd4122ef61b3276edc79b700f0e18de2ff673f5;p=qemu.git

target-mips: Use cpu_reset() in cpu_mips_init()

Commit 0f71a7095db6bc055bc5bb520d85ea650cca8a33 (target-mips: QOM'ify
CPU) hooked up cpu_state_reset() to CPUClass::reset(). Dropping the
introduction of subclasses for 1.1, due to mips_def_t the reset code
could not be QOM'ified yet, i.e. cpu_state_reset() will not forward to
CPUClass::reset().

Update cpu_mips_init() with cpu_reset() nontheless, indirectly calling
cpu_state_reset(), so that generic code can be converted to call
cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/target-mips/translate.c b/target-mips/translate.c
index 0c563eedfa..1ab44ed9c9 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -12709,7 +12709,7 @@ CPUMIPSState *cpu_mips_init (const char *cpu_model)
     fpu_init(env, def);
     mvp_init(env, def);
     mips_tcg_init();
-    cpu_state_reset(env);
+    cpu_reset(CPU(cpu));
     qemu_init_vcpu(env);
     return env;
 }