[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/40] qapi event: convert RESUME
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 17/40] qapi event: convert RESUME |
Date: |
Thu, 19 Jun 2014 15:39:29 -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 | 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 c241a07..cda67d4 100644
--- a/docs/qmp/qmp-events.txt
+++ b/docs/qmp/qmp-events.txt
@@ -264,18 +264,6 @@ Example:
"data": { "node-name": "1.raw", "sector-num": 345435, "sector-count": 5 },
"timestamp": { "seconds": 1344522075, "microseconds": 745528 } }
-RESUME
-------
-
-Emitted when the Virtual Machine resumes execution.
-
-Data: None.
-
-Example:
-
-{ "event": "RESUME",
- "timestamp": { "seconds": 1271770767, "microseconds": 582542 } }
-
RTC_CHANGE
----------
diff --git a/qapi-event.json b/qapi-event.json
index bac7fdc..ac903ef 100644
--- a/qapi-event.json
+++ b/qapi-event.json
@@ -38,3 +38,12 @@
# Since: 0.12.0
##
{ 'event': 'STOP' }
+
+##
+# @RESUME
+#
+# Emitted when the virtual machine resumes execution
+#
+# Since: 0.12.0
+##
+{ 'event': 'RESUME' }
diff --git a/vl.c b/vl.c
index 097fa65..3d56d40 100644
--- a/vl.c
+++ b/vl.c
@@ -1755,7 +1755,7 @@ void vm_start(void)
runstate_set(RUN_STATE_RUNNING);
vm_state_notify(1, RUN_STATE_RUNNING);
resume_all_vcpus();
- monitor_protocol_event(QEVENT_RESUME, NULL);
+ qapi_event_send_resume(&error_abort);
}
}
--
1.9.3
- [Qemu-devel] [PULL 06/40] qapi: Add includes from qapi/ as dependencies, (continued)
- [Qemu-devel] [PULL 06/40] qapi: Add includes from qapi/ as dependencies, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 08/40] qapi script: add event support, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 05/40] os-posix: include sys/time.h, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 09/40] test: add test cases for qapi event, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 04/40] json-lexer: fix escaped backslash in single-quoted string, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 07/40] qapi: add event helper functions, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 11/40] monitor: add an implemention of qapi event emit method, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 10/40] qapi: adjust existing defines, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 14/40] qapi event: convert POWERDOWN, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 15/40] qapi event: convert RESET, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 17/40] qapi event: convert RESUME,
Luiz Capitulino <=
- [Qemu-devel] [PULL 13/40] qapi event: convert SHUTDOWN, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 19/40] qapi event: convert SUSPEND_DISK, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 20/40] qapi event: convert WAKEUP, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 18/40] qapi event: convert SUSPEND, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 21/40] qapi event: convert RTC_CHANGE, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 16/40] qapi event: convert STOP, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 23/40] qapi event: convert DEVICE_DELETED, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 22/40] qapi event: convert WATCHDOG, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 24/40] qapi event: convert DEVICE_TRAY_MOVED, Luiz Capitulino, 2014/06/19
- [Qemu-devel] [PULL 25/40] qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR, Luiz Capitulino, 2014/06/19