diff options
| -rw-r--r-- | docs/qmp/qmp-events.txt | 14 | ||||
| -rw-r--r-- | hw/misc/pvpanic.c | 13 | ||||
| -rw-r--r-- | qapi-event.json | 12 | ||||
| -rw-r--r-- | qapi-schema.json | 12 | ||||
| -rw-r--r-- | target-s390x/kvm.c | 9 |
5 files changed, 29 insertions, 31 deletions
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index 1b0e25fd42..adf45d37c4 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 5377feed69..994f8af8e6 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_PANIC_ACTION_PAUSE, &error_abort); vm_stop(RUN_STATE_GUEST_PANICKED); return; } diff --git a/qapi-event.json b/qapi-event.json index b7438d5877..8a3f3ae118 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -266,3 +266,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: 1.5 +## +{ 'event': 'GUEST_PANICKED', + 'data': { 'action': 'GuestPanicAction' } } diff --git a/qapi-schema.json b/qapi-schema.json index a8de08c0a4..cf3e21a2ab 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3385,4 +3385,16 @@ { 'enum': 'IoOperationType', 'data': [ 'read', 'write' ] } +## +# @GuestPanicAction +# +# An enumeration of the actions taken when guest OS panic is detected +# +# @pause: system pauses +# +# Since: 2.1 +## +{ 'enum': 'GuestPanicAction', + 'data': [ 'pause' ] } + { 'include': 'qapi-event.json' } diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index a1a4cc2cab..a6e587b589 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -39,6 +39,7 @@ #include "monitor/monitor.h" #include "exec/gdbstub.h" #include "trace.h" +#include "qapi-event.h" /* #define DEBUG_KVM */ @@ -1029,12 +1030,8 @@ static bool is_special_wait_psw(CPUState *cs) static void guest_panicked(void) { - 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_PANIC_ACTION_PAUSE, + &error_abort); vm_stop(RUN_STATE_GUEST_PANICKED); } |