aboutsummaryrefslogtreecommitdiff
path: root/target-s390x/helper.h
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2015-06-15 17:57:07 +0200
committerAlexander Graf <agraf@suse.de>2015-06-17 12:40:50 +0200
commit8df7eef3059394bd53cdf7609aac9a50a78aa030 (patch)
tree346f9be7b16eba5e59961069a802bb6de2525e1a /target-s390x/helper.h
parentcbed0ba78f04ce9e2e718431f64eb4b621288aca (diff)
target-s390x: wire up DIAG IPL in TCG mode
DIAG IPL is already implemented for KVM, but not wired from TCG. For that change the format of the instruction so that we can get R1 and R3 numbers in addition to the function code. The diag function can change plenty of things, including CC, so we should enter with a static CC. Also it doesn't set the value of general register 2 to 0 as in the current code. We also need to exit the CPU loop after a reset, which means a new PSW. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-s390x/helper.h')
-rw-r--r--target-s390x/helper.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-s390x/helper.h b/target-s390x/helper.h
index 7e048ecb00..6be9f44aec 100644
--- a/target-s390x/helper.h
+++ b/target-s390x/helper.h
@@ -87,7 +87,7 @@ DEF_HELPER_FLAGS_1(popcnt, TCG_CALL_NO_RWG_SE, i64, i64)
#ifndef CONFIG_USER_ONLY
DEF_HELPER_3(servc, i32, env, i64, i64)
-DEF_HELPER_4(diag, i64, env, i32, i64, i64)
+DEF_HELPER_4(diag, void, env, i32, i32, i32)
DEF_HELPER_3(load_psw, noreturn, env, i64, i64)
DEF_HELPER_FLAGS_2(spx, TCG_CALL_NO_RWG, void, env, i64)
DEF_HELPER_FLAGS_1(stck, TCG_CALL_NO_RWG_SE, i64, env)