From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WficS-0002b1-IN for qemu-devel@nongnu.org; Thu, 01 May 2014 00:29:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WficJ-0002SP-Fa for qemu-devel@nongnu.org; Thu, 01 May 2014 00:29:12 -0400 Received: from mail-ig0-x235.google.com ([2607:f8b0:4001:c05::235]:63432) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WficJ-0002SJ-Aj for qemu-devel@nongnu.org; Thu, 01 May 2014 00:29:03 -0400 Received: by mail-ig0-f181.google.com with SMTP id h18so90248igc.8 for ; Wed, 30 Apr 2014 21:29:02 -0700 (PDT) From: Wenchao Xia Date: Wed, 30 Apr 2014 21:27:00 -0700 Message-Id: <1398918422-3019-27-git-send-email-wenchaoqemu@gmail.com> In-Reply-To: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> References: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> Subject: [Qemu-devel] [PATCH V5 26/28] qapi event: convert GUEST_PANICKED List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, armbru@redhat.com, Wenchao Xia , lcapitulino@redhat.com monitor.h is still included in target-s390x/kvm.c, since no good way to verify whether other code need it on my x86 host. Signed-off-by: Wenchao Xia --- hw/misc/pvpanic.c | 13 ++----------- target-s390x/kvm.c | 8 +++----- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 5377fee..d396b74 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -14,12 +14,12 @@ #include "qapi/qmp/qobject.h" #include "qapi/qmp/qjson.h" -#include "monitor/monitor.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "hw/nvram/fw_cfg.h" #include "hw/i386/pc.h" +#include "qapi-event.h" /* The bit of supported pv event */ #define PVPANIC_F_PANICKED 0 @@ -31,15 +31,6 @@ #define ISA_PVPANIC_DEVICE(obj) \ OBJECT_CHECK(PVPanicState, (obj), TYPE_ISA_PVPANIC_DEVICE) -static void panicked_mon_event(const char *action) -{ - QObject *data; - - data = qobject_from_jsonf("{ 'action': %s }", action); - monitor_protocol_event(QEVENT_GUEST_PANICKED, data); - qobject_decref(data); -} - static void handle_event(int event) { static bool logged; @@ -50,7 +41,7 @@ static void handle_event(int event) } if (event & PVPANIC_PANICKED) { - panicked_mon_event("pause"); + qapi_event_send_guest_panicked(GUEST_PANICK_ACTION_PAUSE, NULL); vm_stop(RUN_STATE_GUEST_PANICKED); return; } diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index a30d1bc..f133b4e 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -37,6 +37,7 @@ #include "qapi/qmp/qjson.h" #include "monitor/monitor.h" #include "trace.h" +#include "qapi-event.h" /* #define DEBUG_KVM */ @@ -784,11 +785,8 @@ static int handle_intercept(S390CPU *cpu) 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); + qapi_event_send_guest_panicked(GUEST_PANICK_ACTION_PAUSE, + NULL); vm_stop(RUN_STATE_GUEST_PANICKED); } } -- 1.7.1