diff options
| author | Wenchao Xia <wenchaoqemu@gmail.com> | 2014-06-18 08:43:52 +0200 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-06-23 11:12:28 -0400 |
| commit | 3a4496903795e05c1e8367bb4c9862d5670f48d7 (patch) | |
| tree | eadd921fdca04524d1c2d68a2590ab59220b6358 /hw/misc | |
| parent | aef9d3115fbaf2b1b904e333b46fe2b070fcbe96 (diff) | |
| download | qemu-3a4496903795e05c1e8367bb4c9862d5670f48d7.zip qemu-3a4496903795e05c1e8367bb4c9862d5670f48d7.tar.gz qemu-3a4496903795e05c1e8367bb4c9862d5670f48d7.tar.bz2 | |
qapi event: convert GUEST_PANICKED
'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 <wenchaoqemu@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'hw/misc')
| -rw-r--r-- | hw/misc/pvpanic.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 5377fee..994f8af 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; } |