From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:32889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UT5PU-0001To-Tj for qemu-devel@nongnu.org; Fri, 19 Apr 2013 03:07:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UT5PS-0004ND-OI for qemu-devel@nongnu.org; Fri, 19 Apr 2013 03:07:04 -0400 Received: from [222.73.24.84] (port=49944 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UT5PS-0004Lv-Cw for qemu-devel@nongnu.org; Fri, 19 Apr 2013 03:07:02 -0400 From: Hu Tao Date: Fri, 19 Apr 2013 15:06:25 +0800 Message-Id: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v20 7/7] Wire up disabled wait a panicked event on s390 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Christian Borntraeger From: Christian Borntraeger 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
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 --- target-s390x/kvm.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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; -- 1.8.1.4