From: David Hildenbrand <da...@redhat.com>
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 <da...@redhat.com>
Message-Id: <20170928203708.9376-11-da...@redhat.com>
Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
Signed-off-by: Cornelia Huck <coh...@redhat.com>
---
target/s390x/helper.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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));
}
}
--
2.13.6
