aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2012-04-22 23:52:25 +0000
committerAlexander Graf <agraf@suse.de>2012-05-01 21:04:06 +0200
commiteca3ed0343ba413937f34ad4f8c4822dc82924e5 (patch)
tree6296ee056930115007c919e62e6d3343f514313c
parentad0bbc560026fb21c5b3d07631457e3be84d0f42 (diff)
S390: dont call system_shutdown on disabled wait
A disabled wait usually indicates a guest problem. Dont shutdown the guest to allow guest dumping. Have some special cases, e.g. a quiesce disabled wait. In that case we want to shutdown. Long term solution might be a crashed/panic indication. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--target-s390x/kvm.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 956730d638..90aad61eb0 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -407,6 +407,12 @@ static int handle_instruction(CPUS390XState *env, struct kvm_run *run)
return 0;
}
+static bool is_special_wait_psw(CPUS390XState *env)
+{
+ /* signal quiesce */
+ return env->kvm_run->psw_addr == 0xfffUL;
+}
+
static int handle_intercept(CPUS390XState *env)
{
struct kvm_run *run = env->kvm_run;
@@ -420,6 +426,12 @@ static int handle_intercept(CPUS390XState *env)
r = handle_instruction(env, run);
break;
case ICPT_WAITPSW:
+ if (s390_del_running_cpu(env) == 0 &&
+ is_special_wait_psw(env)) {
+ qemu_system_shutdown_request();
+ }
+ r = EXCP_HALTED;
+ break;
case ICPT_CPU_STOP:
if (s390_del_running_cpu(env) == 0) {
qemu_system_shutdown_request();