aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-04 19:33:05 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:42 +0200
commiteded12679dcf4c205c00bebfb77fb9883d2a2f68 (patch)
tree3b79341d3597d0c1824beeac7862f2bddbe95364
parentadbb0f75f0be1d747503e5b19ce6a7efa37cf562 (diff)
xtensa_lx60: Pass XtensaCPU to lx60_reset()
Allows us to use cpu_reset() in place of cpu_state_reset(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Max Filippov <jcmvbkbc@gmail.com>
-rw-r--r--hw/xtensa_lx60.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index 31f8adc684..b153bfdddf 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -148,9 +148,9 @@ static uint64_t translate_phys_addr(void *env, uint64_t addr)
static void lx60_reset(void *opaque)
{
- CPUXtensaState *env = opaque;
+ XtensaCPU *cpu = opaque;
- cpu_state_reset(env);
+ cpu_reset(CPU(cpu));
}
static void lx_init(const LxBoardDesc *board,
@@ -184,7 +184,7 @@ static void lx_init(const LxBoardDesc *board,
env = &cpu->env;
env->sregs[PRID] = n;
- qemu_register_reset(lx60_reset, env);
+ qemu_register_reset(lx60_reset, cpu);
/* Need MMU initialized prior to ELF loading,
* so that ELF gets loaded into virtual addresses
*/