Patchwork [V5,26/28] qapi event: convert GUEST_PANICKED

login
register
mail settings
Submitter Wenchao Xia
Date May 1, 2014, 4:27 a.m.
Message ID <1398918422-3019-27-git-send-email-wenchaoqemu@gmail.com>
Download mbox | patch
Permalink /patch/344418/
State New
Headers show

Comments

Wenchao Xia - May 1, 2014, 4:27 a.m.
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 <wenchaoqemu@gmail.com>
---
 hw/misc/pvpanic.c  |   13 ++-----------
 target-s390x/kvm.c |    8 +++-----
 2 files changed, 5 insertions(+), 16 deletions(-)

Patch

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);
                 }
             }