diff options
author | Andreas Färber <afaerber@suse.de> | 2012-05-05 14:14:00 +0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:43 +0200 |
commit | 1004ee8d26ea8584be26cce0212cec68d5d93117 (patch) | |
tree | 78bc75fd3dc2cca5ba046f0fb9ab0c5fbde2d230 /hw | |
parent | 7688b134b8a47a615529b7caaae49da3cf91dcca (diff) | |
download | hqemu-1004ee8d26ea8584be26cce0212cec68d5d93117.zip hqemu-1004ee8d26ea8584be26cce0212cec68d5d93117.tar.gz |
mips_malta: Pass MIPSCPU to main_cpu_reset()
Allows us to use cpu_reset() in place of cpu_state_reset().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/mips_malta.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index d81e8d5..dfd7b6b 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -751,8 +751,10 @@ static void malta_mips_config(CPUMIPSState *env) static void main_cpu_reset(void *opaque) { - CPUMIPSState *env = opaque; - cpu_state_reset(env); + MIPSCPU *cpu = opaque; + CPUMIPSState *env = &cpu->env; + + cpu_reset(CPU(cpu)); /* The bootloader does not need to be rewritten as it is located in a read only location. The kernel location and the arguments table @@ -836,7 +838,7 @@ void mips_malta_init (ram_addr_t ram_size, /* Init internal devices */ cpu_mips_irq_init_cpu(env); cpu_mips_clock_init(env); - qemu_register_reset(main_cpu_reset, env); + qemu_register_reset(main_cpu_reset, cpu); } env = first_cpu; |