[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2.1 16/36] qapi event: convert WAKEUP
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 2.1 16/36] qapi event: convert WAKEUP |
Date: |
Wed, 18 Jun 2014 08:43:40 +0200 |
From: Wenchao Xia <address@hidden>
Signed-off-by: Wenchao Xia <address@hidden>
Signed-off-by: Paolo Bonzini <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 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' }
diff --git a/vl.c b/vl.c
index 107176c..bcda808 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(&error_abort);
}
if (qemu_powerdown_requested()) {
qemu_system_powerdown();
--
1.9.3
- Re: [Qemu-devel] [PATCH 2.1 03/36] qapi: add event helper functions, (continued)
- [Qemu-devel] [PATCH 2.1 06/36] qapi: adjust existing defines, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 07/36] monitor: add an implemention of qapi event emit method, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 09/36] qapi event: convert SHUTDOWN, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 10/36] qapi event: convert POWERDOWN, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 11/36] qapi event: convert RESET, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 12/36] qapi event: convert STOP, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 14/36] qapi event: convert SUSPEND, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 15/36] qapi event: convert SUSPEND_DISK, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 16/36] qapi event: convert WAKEUP,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 2.1 13/36] qapi event: convert RESUME, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 17/36] qapi event: convert RTC_CHANGE, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 18/36] qapi event: convert WATCHDOG, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 19/36] qapi event: convert DEVICE_DELETED, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 20/36] qapi event: convert DEVICE_TRAY_MOVED, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 22/36] qapi event: convert BLOCK_IMAGE_CORRUPTED, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 23/36] qapi event: convert other BLOCK_JOB events, Paolo Bonzini, 2014/06/18