[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V5 26/28] qapi event: convert GUEST_PANICKED
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V5 26/28] qapi event: convert GUEST_PANICKED |
Date: |
Wed, 30 Apr 2014 21:27:00 -0700 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH V5 16/28] qapi event: convert WATCHDOG, (continued)
- [Qemu-devel] [PATCH V5 16/28] qapi event: convert WATCHDOG, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 17/28] qapi event: convert DEVICE_DELETED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 18/28] qapi event: convert DEVICE_TRAY_MOVED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 19/28] qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 20/28] qapi event: convert BLOCK_IMAGE_CORRUPTED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 21/28] qapi event: convert other BLOCK_JOB events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 22/28] qapi event: convert NIC_RX_FILTER_CHANGED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 23/28] qapi event: convert VNC events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 24/28] qapi event: convert SPICE events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 25/28] qapi event: convert BALLOON_CHANGE, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 26/28] qapi event: convert GUEST_PANICKED,
Wenchao Xia <=
- [Qemu-devel] [PATCH V5 27/28] qapi event: convert QUORUM events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 28/28] qapi event: clean up, Wenchao Xia, 2014/05/01