[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/43] qapi event: convert RESUME
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 19/43] qapi event: convert RESUME |
Date: |
Mon, 23 Jun 2014 12:36:19 -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 | 4 ++--
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt
index cb32530..fb26a1a 100644
--- a/docs/qmp/qmp-events.txt
+++ b/docs/qmp/qmp-events.txt
@@ -274,18 +274,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 55fabf8..fb91939 100644
--- a/vl.c
+++ b/vl.c
@@ -736,7 +736,7 @@ void vm_start(void)
* the STOP event.
*/
if (runstate_is_running()) {
- monitor_protocol_event(QEVENT_STOP, NULL);
+ qapi_event_send_stop(&error_abort);
} else {
cpu_enable_ticks();
runstate_set(RUN_STATE_RUNNING);
@@ -744,7 +744,7 @@ void vm_start(void)
resume_all_vcpus();
}
- monitor_protocol_event(QEVENT_RESUME, NULL);
+ qapi_event_send_resume(&error_abort);
}
--
1.9.3
- [Qemu-devel] [PULL 40/43] qemu-char: move pty_chr_update_read_handler around, (continued)
- [Qemu-devel] [PULL 40/43] qemu-char: move pty_chr_update_read_handler around, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 05/43] qapi: Suppress unwanted space between type and identifier, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 41/43] qemu-char: make writes thread-safe, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 04/43] qapi: add const prefix to 'char *' insider c_type(), Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 10/43] qapi script: add event support, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 34/43] qapi event: convert BALLOON_CHANGE, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 25/43] qapi event: convert DEVICE_DELETED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 16/43] qapi event: convert POWERDOWN, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 29/43] qapi event: convert other BLOCK_JOB events, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 09/43] qapi: add event helper functions, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 19/43] qapi event: convert RESUME,
Luiz Capitulino <=
- [Qemu-devel] [PULL 42/43] monitor: protect outbuf and mux_out with mutex, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 21/43] qapi event: convert SUSPEND_DISK, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 24/43] qapi event: convert WATCHDOG, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 39/43] qemu-char: do not call chr_write directly, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 37/43] qapi event: clean up, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 43/43] monitor: protect event emission, Luiz Capitulino, 2014/06/23
- Re: [Qemu-devel] [PULL 00/43] QMP queue, Luiz Capitulino, 2014/06/23
- Re: [Qemu-devel] [PULL 00/43] QMP queue, Eric Blake, 2014/06/23
- Re: [Qemu-devel] [PULL 00/43] QMP queue, Peter Maydell, 2014/06/24