[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V6 15/29] qapi event: convert WAKEUP
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V6 15/29] qapi event: convert WAKEUP |
Date: |
Thu, 5 Jun 2014 05:22:10 -0700 |
Signed-off-by: Wenchao Xia <address@hidden>
---
docs/qmp/qmp-events.txt | 12 ------------
qapi-event.json | 9 +++++++++
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 c2f23ef..3d82db4 100644
--- a/docs/qmp/qmp-events.txt
+++ b/docs/qmp/qmp-events.txt
@@ -432,18 +432,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 c68edfd..32ac571 100644
--- a/qapi-event.json
+++ b/qapi-event.json
@@ -69,3 +69,12 @@
# Since: 2.1
##
{ 'event': 'SUSPEND_DISK' }
+
+##
+# @WAKEUP
+#
+# Emitted when the guest has woken up from suspend state and is running
+#
+# Since: 2.1
+##
+{ 'event': 'WAKEUP' }
diff --git a/vl.c b/vl.c
index c6cb2c1..b8ad1df 100644
--- a/vl.c
+++ b/vl.c
@@ -2052,7 +2052,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(NULL);
}
if (qemu_powerdown_requested()) {
qemu_system_powerdown();
--
1.7.1
- [Qemu-devel] [PATCH V6 11/29] qapi event: convert STOP, (continued)
- [Qemu-devel] [PATCH V6 12/29] qapi event: convert RESUME, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 13/29] qapi event: convert SUSPEND, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 14/29] qapi event: convert SUSPEND_DISK, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 15/29] qapi event: convert WAKEUP,
Wenchao Xia <=
- [Qemu-devel] [PATCH V6 16/29] qapi event: convert RTC_CHANGE, Wenchao Xia, 2014/06/05
[Qemu-devel] [PATCH V6 18/29] qapi event: convert DEVICE_DELETED, Wenchao Xia, 2014/06/05
[Qemu-devel] [PATCH V6 19/29] qapi event: convert DEVICE_TRAY_MOVED, Wenchao Xia, 2014/06/05