summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Kern <phil@philkern.de>2015-08-18 13:50:55 +0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2017-08-31 11:21:20 -0500
commitc152efc943d4e3a1aa2986d7388b89b87cc59520 (patch)
tree882cc0aed547a4705834aa2f23cd79cf15feb3b8
parent077a67e929b083704d265eb883aa84a368f4ad4a (diff)
downloadqemu-c152efc943d4e3a1aa2986d7388b89b87cc59520.tar.gz
target-s390x: Mask the SIGP order_code to 8bit.
According to "CPU Signaling and Response", "Signal-Processor Orders", the order field is bit position 56-63. Without this, the Linux guest kernel is sometimes unable to stop emulation and enters an infinite loop of "XXX unknown sigp: 0xffffffff00000005". Signed-off-by: Philipp Kern <phil@philkern.de> Reviewed-by: Thomas Huth <thuth@tuxfamily.org> [agraf: add comment according to email] Signed-off-by: Alexander Graf <agraf@suse.de> (cherry picked from commit 601b9a9008c5a612d76073bb3f178621cff41980) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--target/s390x/misc_helper.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
index 93b0e61366..83d38944d7 100644
--- a/target/s390x/misc_helper.c
+++ b/target/s390x/misc_helper.c
@@ -515,7 +515,8 @@ uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1,
/* Remember: Use "R1 or R1 + 1, whichever is the odd-numbered register"
as parameter (input). Status (output) is always R1. */
- switch (order_code) {
+ /* sigp contains the order code in bit positions 56-63, mask it here. */
+ switch (order_code & 0xff) {
case SIGP_SET_ARCH:
/* switch arch */
break;