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>
This commit is contained in:
David Hildenbrand 2017-09-28 22:36:48 +02:00 committed by Cornelia Huck
parent f1cbfe6a73
commit c6892047dc
1 changed files with 2 additions and 1 deletions

View File

@ -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));
}
}