diff options
| author |   Andreas Färber <afaerber@suse.de> | 2012-04-11 01:37:45 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-04-12 01:08:04 +0200 |
| commit | 3eab1690851fa68698612d9dd9d5231759f549c2 (patch) | |
| tree | a2513359fc4aa030d5d489346fe7ffa91f44e6c2 | |
| parent | target-lm32: QOM'ify CPU init (diff) | |
| download | qemu-kvm-3eab1690851fa68698612d9dd9d5231759f549c2.tar.gz qemu-kvm-3eab1690851fa68698612d9dd9d5231759f549c2.tar.bz2 qemu-kvm-3eab1690851fa68698612d9dd9d5231759f549c2.zip | |
target-lm32: QOM'ify CPU reset
Move code from cpu_state_reset() into QOM lm32_cpu_reset().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Michael Walle <michael@walle.cc>
| -rw-r--r-- | target-lm32/cpu.c | 10 | ||||
| -rw-r--r-- | target-lm32/helper.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c index 70251d054..48a5fe3f8 100644 --- a/target-lm32/cpu.c +++ b/target-lm32/cpu.c @@ -29,9 +29,17 @@ static void lm32_cpu_reset(CPUState *s) LM32CPUClass *lcc = LM32_CPU_GET_CLASS(cpu); CPULM32State *env = &cpu->env; + if (qemu_loglevel_mask(CPU_LOG_RESET)) { + qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); + log_cpu_state(env, 0); + } + lcc->parent_reset(s); - cpu_state_reset(env); + tlb_flush(env, 1); + + /* reset cpu state */ + memset(env, 0, offsetof(CPULM32State, breakpoints)); } static void lm32_cpu_initfn(Object *obj) diff --git a/target-lm32/helper.c b/target-lm32/helper.c index 9de777f43..d0bc1931d 100644 --- a/target-lm32/helper.c +++ b/target-lm32/helper.c @@ -236,14 +236,6 @@ void cpu_lm32_set_phys_msb_ignore(CPULM32State *env, int value) void cpu_state_reset(CPULM32State *env) { - if (qemu_loglevel_mask(CPU_LOG_RESET)) { - qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); - log_cpu_state(env, 0); - } - - tlb_flush(env, 1); - - /* reset cpu state */ - memset(env, 0, offsetof(CPULM32State, breakpoints)); + cpu_reset(ENV_GET_CPU(env)); } |