[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/43] qapi event: convert SUSPEND
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 20/43] qapi event: convert SUSPEND |
Date: |
Mon, 23 Jun 2014 12:36:20 -0400 |
From: Wenchao Xia <address@hidden>
Signed-off-by: Wenchao Xia <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <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 fb26a1a..d0b7b99 100644
--- a/docs/qmp/qmp-events.txt
+++ b/docs/qmp/qmp-events.txt
@@ -352,18 +352,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 ac903ef..d45b341 100644
--- a/qapi-event.json
+++ b/qapi-event.json
@@ -47,3 +47,13 @@
# Since: 0.12.0
##
{ 'event': 'RESUME' }
+
+##
+# @SUSPEND
+#
+# Emitted when guest enters a hardware suspension state, for example, S3 state,
+# which is sometimes called standby state
+#
+# Since: 1.1
+##
+{ 'event': 'SUSPEND' }
diff --git a/vl.c b/vl.c
index fb91939..aaa9ee5 100644
--- a/vl.c
+++ b/vl.c
@@ -1869,7 +1869,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(&error_abort);
}
void qemu_system_suspend_request(void)
--
1.9.3
- [Qemu-devel] [PULL 00/43] QMP queue, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 01/43] fpu: softfloat: drop INLINE macro, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 02/43] audio: fmopl: drop INLINE macro, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 06/43] json-lexer: fix escaped backslash in single-quoted string, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 03/43] qapi: fix coding style in parameters list, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 07/43] os-posix: include sys/time.h, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 08/43] qapi: Add includes from qapi/ as dependencies, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 12/43] qapi: adjust existing defines, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 13/43] monitor: add an implemention of qapi event emit method, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 14/43] qapi: add new schema file qapi-event.json, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 20/43] qapi event: convert SUSPEND,
Luiz Capitulino <=
- [Qemu-devel] [PULL 11/43] test: add test cases for qapi event, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 17/43] qapi event: convert RESET, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 18/43] qapi event: convert STOP, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 22/43] qapi event: convert WAKEUP, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 23/43] qapi event: convert RTC_CHANGE, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 15/43] qapi event: convert SHUTDOWN, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 27/43] qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 26/43] qapi event: convert DEVICE_TRAY_MOVED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 32/43] qapi event: convert SPICE events, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 28/43] qapi event: convert BLOCK_IMAGE_CORRUPTED, Luiz Capitulino, 2014/06/23