diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-05 14:19:45 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:43 +0200 |
| commit | 2d44fc8e2ed1e1efff6ea73de0aea75c44262459 (patch) | |
| tree | 3597e32a2dd7894824cf250bcc6725ed9c91f2d7 | |
| parent | 7ee274c1937deccfaaa0c98389349eb3e9a6c90d (diff) | |
| download | qemu-2d44fc8e2ed1e1efff6ea73de0aea75c44262459.tar.gz | |
mips_mipssim: Store MIPSCPU in ResetData
Allows us to use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | hw/mips_mipssim.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c index 7c510da2b2..eb03047433 100644 --- a/hw/mips_mipssim.c +++ b/hw/mips_mipssim.c @@ -46,7 +46,7 @@ static struct _loaderparams { } loaderparams; typedef struct ResetData { - CPUMIPSState *env; + MIPSCPU *cpu; uint64_t vector; } ResetData; @@ -105,9 +105,9 @@ static int64_t load_kernel(void) static void main_cpu_reset(void *opaque) { ResetData *s = (ResetData *)opaque; - CPUMIPSState *env = s->env; + CPUMIPSState *env = &s->cpu->env; - cpu_state_reset(env); + cpu_reset(CPU(s->cpu)); env->active_tc.PC = s->vector & ~(target_ulong)1; if (s->vector & 1) { env->hflags |= MIPS_HFLAG_M16; @@ -161,7 +161,7 @@ mips_mipssim_init (ram_addr_t ram_size, env = &cpu->env; reset_info = g_malloc0(sizeof(ResetData)); - reset_info->env = env; + reset_info->cpu = cpu; reset_info->vector = env->active_tc.PC; qemu_register_reset(main_cpu_reset, reset_info); |