diff options
author | Wenchao Xia <wenchaoqemu@gmail.com> | 2014-06-18 08:43:40 +0200 |
---|---|---|
committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-06-23 11:12:27 -0400 |
commit | 7a906f7ffb467576507956fe455dd1f55f6ba4ff (patch) | |
tree | 5d1a8c3e2f1a6c01c3eb6fdf53e89d1152fe8f6e | |
parent | 2ea4100f44af4280c5f566c94ac02f188e8ff24c (diff) | |
download | hqemu-7a906f7ffb467576507956fe455dd1f55f6ba4ff.zip hqemu-7a906f7ffb467576507956fe455dd1f55f6ba4ff.tar.gz |
qapi event: convert WAKEUP
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>
-rw-r--r-- | docs/qmp/qmp-events.txt | 12 | ||||
-rw-r--r-- | qapi-event.json | 9 | ||||
-rw-r--r-- | vl.c | 2 |
3 files changed, 10 insertions, 13 deletions
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index 71eff0d..e69042c 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -442,18 +442,6 @@ Example: "host": "127.0.0.1", "sasl_username": "luiz" } }, "timestamp": { "seconds": 1263475302, "microseconds": 150772 } } -WAKEUP ------- - -Emitted when the guest has woken up from S3 and is running. - -Data: None. - -Example: - -{ "event": "WAKEUP", - "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } - WATCHDOG -------- diff --git a/qapi-event.json b/qapi-event.json index 469353c..807a6f5 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -69,3 +69,12 @@ # Since: 1.2 ## { 'event': 'SUSPEND_DISK' } + +## +# @WAKEUP +# +# Emitted when the guest has woken up from suspend state and is running +# +# Since: 1.1 +## +{ 'event': 'WAKEUP' } @@ -1987,7 +1987,7 @@ static bool main_loop_should_exit(void) notifier_list_notify(&wakeup_notifiers, &wakeup_reason); wakeup_reason = QEMU_WAKEUP_REASON_NONE; resume_all_vcpus(); - monitor_protocol_event(QEVENT_WAKEUP, NULL); + qapi_event_send_wakeup(&error_abort); } if (qemu_powerdown_requested()) { qemu_system_powerdown(); |