Message ID | 6cf41156322e27e81a727b69f03728dbc225d5bb.1366945969.git.hutao@cn.fujitsu.com |
---|---|
State | New |
Headers | show |
Hu Tao <hutao@cn.fujitsu.com> writes: > From: Christian Borntraeger <borntraeger@de.ibm.com> > > On s390 the disabled wait state indicates a state of attention. > For example Linux uses that state after a panic. Lets > put the system into panicked state. > > An alternative implementation would be to state > disabled-wait <address> instead of pause in the action field. > (e.g. z/OS, z/VM and other classic OSes use the address of the > disabled wait to indicate an error code). > > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> I'm not qualified to review this one. Thanks for your patience!
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 644f484..0c111f0 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -34,6 +34,8 @@ #include "sysemu/kvm.h" #include "cpu.h" #include "sysemu/device_tree.h" +#include "qapi/qmp/qjson.h" +#include "monitor/monitor.h" /* #define DEBUG_KVM */ @@ -705,9 +707,18 @@ static int handle_intercept(S390CPU *cpu) r = handle_instruction(cpu, run); break; case ICPT_WAITPSW: - if (s390_del_running_cpu(cpu) == 0 && - is_special_wait_psw(cs)) { - qemu_system_shutdown_request(); + /* disabled wait, since enabled wait is handled in kernel */ + if (s390_del_running_cpu(cpu) == 0) { + if (is_special_wait_psw(cs)) { + qemu_system_shutdown_request(); + } else { + QObject *data; + + data = qobject_from_jsonf("{ 'action': %s }", "pause"); + monitor_protocol_event(QEVENT_GUEST_PANICKED, data); + qobject_decref(data); + vm_stop(RUN_STATE_GUEST_PANICKED); + } } r = EXCP_HALTED; break;