[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V6 13/29] qapi event: convert SUSPEND
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V6 13/29] qapi event: convert SUSPEND |
Date: |
Thu, 5 Jun 2014 05:22:08 -0700 |
Signed-off-by: Wenchao Xia <address@hidden>
---
docs/qmp/qmp-events.txt | 12 ------------
qapi-event.json | 10 ++++++++++
vl.c | 2 +-
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt
index cda67d4..d86a077 100644
--- a/docs/qmp/qmp-events.txt
+++ b/docs/qmp/qmp-events.txt
@@ -342,18 +342,6 @@ Example:
"channel-id": 0, "tls": true}
}}
-SUSPEND
--------
-
-Emitted when guest enters S3 state.
-
-Data: None.
-
-Example:
-
-{ "event": "SUSPEND",
- "timestamp": { "seconds": 1344456160, "microseconds": 309119 } }
-
SUSPEND_DISK
------------
diff --git a/qapi-event.json b/qapi-event.json
index 3485985..83c4ea2 100644
--- a/qapi-event.json
+++ b/qapi-event.json
@@ -47,3 +47,13 @@
# Since: 2.1
##
{ 'event': 'RESUME' }
+
+##
+# @SUSPEND
+#
+# Emitted when guest enters a hardware suspension state, for example, S3 state,
+# which is sometimes called standby state
+#
+# Since: 2.1
+##
+{ 'event': 'SUSPEND' }
diff --git a/vl.c b/vl.c
index d195e50..c6cb2c1 100644
--- a/vl.c
+++ b/vl.c
@@ -1928,7 +1928,7 @@ static void qemu_system_suspend(void)
pause_all_vcpus();
notifier_list_notify(&suspend_notifiers, NULL);
runstate_set(RUN_STATE_SUSPENDED);
- monitor_protocol_event(QEVENT_SUSPEND, NULL);
+ qapi_event_send_suspend(NULL);
}
void qemu_system_suspend_request(void)
--
1.7.1
- [Qemu-devel] [PATCH V6 08/29] qapi event: convert SHUTDOWN, (continued)
- [Qemu-devel] [PATCH V6 08/29] qapi event: convert SHUTDOWN, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 09/29] qapi event: convert POWERDOWN, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 10/29] qapi event: convert RESET, Wenchao Xia, 2014/06/05
- [Qemu-devel] [PATCH V6 11/29] qapi event: convert STOP, Wenchao Xia, 2014/06/05
- [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 <=
- [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, 2014/06/05
- [Qemu-devel] [PATCH V6 16/29] qapi event: convert RTC_CHANGE, Wenchao Xia, 2014/06/05