diff options
| author | David Hildenbrand | 2017-09-28 22:36:46 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2017-10-20 13:32:10 +0200 |
| commit | 83f7f32901c630f4fc01acd0d9082da466b17102 (patch) | |
| tree | 2c571253c7a9908b5cb6a2f8ef27f5cab93ba4a3 /target/s390x/helper.c | |
| parent | s390x/tcg: a CPU cannot switch state due to an interrupt (diff) | |
| download | qemu-83f7f32901c630f4fc01acd0d9082da466b17102.tar.gz qemu-83f7f32901c630f4fc01acd0d9082da466b17102.tar.xz qemu-83f7f32901c630f4fc01acd0d9082da466b17102.zip | |
target/s390x: factor out handling of WAIT PSW into s390_handle_wait()
This will now also detect crashes under TCG. We can directly use
cpu->env.psw.addr instead of kvm_run, as we do a cpu_synchronize_state().
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170928203708.9376-9-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target/s390x/helper.c')
| -rw-r--r-- | target/s390x/helper.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/target/s390x/helper.c b/target/s390x/helper.c index e22b93258b..2d7df83c59 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -26,6 +26,7 @@ #include "qemu/timer.h" #include "exec/exec-all.h" #include "hw/s390x/ioinst.h" +#include "sysemu/hw_accel.h" #ifndef CONFIG_USER_ONLY #include "sysemu/sysemu.h" #endif @@ -113,6 +114,25 @@ hwaddr s390_cpu_get_phys_addr_debug(CPUState *cs, vaddr vaddr) return phys_addr; } +static inline bool is_special_wait_psw(uint64_t psw_addr) +{ + /* signal quiesce */ + return psw_addr == 0xfffUL; +} + +void s390_handle_wait(S390CPU *cpu) +{ + if (s390_cpu_halt(cpu) == 0) { +#ifndef CONFIG_USER_ONLY + if (is_special_wait_psw(cpu->env.psw.addr)) { + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); + } else { + qemu_system_guest_panicked(NULL); + } +#endif + } +} + void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr) { uint64_t old_mask = env->psw.mask; @@ -128,12 +148,7 @@ void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr) } if (mask & PSW_MASK_WAIT) { - S390CPU *cpu = s390_env_get_cpu(env); - if (s390_cpu_halt(cpu) == 0) { -#ifndef CONFIG_USER_ONLY - qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); -#endif - } + s390_handle_wait(s390_env_get_cpu(env)); } } |