[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V6 27/29] qapi event: convert GUEST_PANICKED
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V6 27/29] qapi event: convert GUEST_PANICKED |
Date: |
Thu, 5 Jun 2014 05:22:22 -0700 |
'monitor.h' is still included in target-s390x/kvm.c, since I have
no good way to verify whether other code need it on my x86 host.
Signed-off-by: Wenchao Xia <address@hidden>
---
docs/qmp/qmp-events.txt | 14 --------------
hw/misc/pvpanic.c | 13 ++-----------
qapi-event.json | 12 ++++++++++++
qapi-schema.json | 12 ++++++++++++
target-s390x/kvm.c | 8 +++-----
5 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt
index 1b0e25f..adf45d3 100644
--- a/docs/qmp/qmp-events.txt
+++ b/docs/qmp/qmp-events.txt
@@ -1,20 +1,6 @@
QEMU Machine Protocol Events
============================
-GUEST_PANICKED
---------------
-
-Emitted when guest OS panic is detected.
-
-Data:
-
-- "action": Action that has been taken (json-string, currently always "pause").
-
-Example:
-
-{ "event": "GUEST_PANICKED",
- "data": { "action": "pause" } }
-
QUORUM_FAILURE
--------------
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/qapi-event.json b/qapi-event.json
index 93f9eeb..6bfc2a7 100644
--- a/qapi-event.json
+++ b/qapi-event.json
@@ -400,3 +400,15 @@
##
{ 'event': 'BALLOON_CHANGE',
'data': { 'actual': 'int' } }
+
+##
+# @GUEST_PANICKED
+#
+# Emitted when guest OS panic is detected
+#
+# @action: action that has been taken, currently always "pause"
+#
+# Since: 2.1
+##
+{ 'event': 'GUEST_PANICKED',
+ 'data': { 'action': 'GuestPanickAction' } }
diff --git a/qapi-schema.json b/qapi-schema.json
index 23be2bf..badc1bf 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -4837,4 +4837,16 @@
{ 'enum': 'IoOperationType',
'data': [ 'read', 'write' ] }
+##
+# @GuestPanickAction
+#
+# An enumeration of the actions taken when guest OS panic is detected
+#
+# @pause: system pauses
+#
+# Since: 2.1
+##
+{ 'enum': 'GuestPanickAction',
+ 'data': [ 'pause' ] }
+
{ 'include': 'qapi-event.json' }
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 7a07f9d..2212583 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -38,6 +38,7 @@
#include "monitor/monitor.h"
#include "exec/gdbstub.h"
#include "trace.h"
+#include "qapi-event.h"
/* #define DEBUG_KVM */
@@ -891,11 +892,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
- Re: [Qemu-devel] [PATCH V6 21/29] qapi event: convert BLOCK_IMAGE_CORRUPTED, (continued)
- [Qemu-devel] [PATCH V6 22/29] qapi event: convert other BLOCK_JOB events, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 23/29] qapi event: convert NIC_RX_FILTER_CHANGED, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 24/29] qapi event: convert VNC events, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 25/29] qapi event: convert SPICE events, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 26/29] qapi event: convert BALLOON_CHANGE, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 28/29] qapi event: convert QUORUM events, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 27/29] qapi event: convert GUEST_PANICKED,
Wenchao Xia <=
- [Qemu-devel] [PATCH V6 29/29] qapi event: clean up, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 17/29] qapi event: convert WATCHDOG, Wenchao Xia, 2014/06/05
Re: [Qemu-devel] [PATCH V6 00/29] add direct support of event in qapi schema, Paolo Bonzini, 2014/06/10