diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-09-01 16:51:34 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-03-13 19:20:47 +0100 |
| commit | 3f38f309b22d9a30b5b427501eb3d522c439482e (patch) | |
| tree | 9536fe55f500c6f99879a1bc35d2b5efbb22c706 /target-s390x | |
| parent | 5638d180d6c469fc4c56127a3c717e8b9f27d925 (diff) | |
| download | qemu-3f38f309b22d9a30b5b427501eb3d522c439482e.zip qemu-3f38f309b22d9a30b5b427501eb3d522c439482e.tar.gz qemu-3f38f309b22d9a30b5b427501eb3d522c439482e.tar.bz2 | |
translate-all: Change cpu_restore_state() argument to CPUState
This lets us drop some local variables in tlb_fill() functions.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/mem_helper.c | 5 | ||||
| -rw-r--r-- | target-s390x/misc_helper.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c index e89fcac..e1c2ac0 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_helper.c @@ -51,12 +51,9 @@ void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx, ret = s390_cpu_handle_mmu_fault(cs, addr, is_write, mmu_idx); if (unlikely(ret != 0)) { - S390CPU *cpu = S390_CPU(cs); - CPUS390XState *env = &cpu->env; - if (likely(retaddr)) { /* now we have a real cpu fault */ - cpu_restore_state(env, retaddr); + cpu_restore_state(cs, retaddr); } cpu_loop_exit(cs); } diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index 2beec61..942b5f7 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -54,7 +54,7 @@ void QEMU_NORETURN runtime_exception(CPUS390XState *env, int excp, env->int_pgm_code = excp; /* Use the (ultimate) callers address to find the insn that trapped. */ - cpu_restore_state(env, retaddr); + cpu_restore_state(cs, retaddr); /* Advance past the insn. */ t = cpu_ldub_code(env, env->psw.addr); |