aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWenchao Xia <wenchaoqemu@gmail.com>2014-06-18 08:43:37 +0200
committerLuiz Capitulino <lcapitulino@redhat.com>2014-06-23 11:12:24 -0400
commit591c48fbc5390eced7c787a5fbb72552ef62e56a (patch)
tree5d2dd17e29cedd26f6ed11805636b36908d917f3
parenta4e15de9a2ab65b4ab276cded6f5c3758691bd74 (diff)
downloadqemu-591c48fbc5390eced7c787a5fbb72552ef62e56a.zip
qemu-591c48fbc5390eced7c787a5fbb72552ef62e56a.tar.gz
qemu-591c48fbc5390eced7c787a5fbb72552ef62e56a.tar.bz2
qapi event: convert RESUME
Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
-rw-r--r--docs/qmp/qmp-events.txt12
-rw-r--r--qapi-event.json9
-rw-r--r--vl.c4
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);
}