diff options
| author | David Hildenbrand <david@redhat.com> | 2017-09-28 22:36:48 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-10-20 13:32:10 +0200 |
| commit | c6892047dc15a9106a1657b07ed1c915cabc8a06 (patch) | |
| tree | ba55dca520adc5b71951b274b5d38a7a0eb72f87 | |
| parent | f1cbfe6a736cf5a676fcdafcafdeb24125358c4e (diff) | |
target/s390x: interpret PSW_MASK_WAIT only for TCG
KVM handles the wait PSW itself and triggers a WAIT ICPT in case it
really wants to sleep (disabled wait).
This will later allow us to change the order of loading a restart
interrupt and setting a CPU to OPERATING on SIGP RESTART without
changing KVM behavior.
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170928203708.9376-11-david@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | target/s390x/helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 2d7df83c59..baa18777f1 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -147,7 +147,8 @@ void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr) s390_cpu_recompute_watchpoints(CPU(s390_env_get_cpu(env))); } - if (mask & PSW_MASK_WAIT) { + /* KVM will handle all WAITs and trigger a WAIT exit on disabled_wait */ + if (tcg_enabled() && (mask & PSW_MASK_WAIT)) { s390_handle_wait(s390_env_get_cpu(env)); } } |