diff mbox

[V6,12/29] qapi event: convert RESUME

Message ID 1401970944-18735-13-git-send-email-wenchaoqemu@gmail.com
State New
Headers show

Commit Message

Wenchao Xia June 5, 2014, 12:22 p.m. UTC
Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com>
---
 docs/qmp/qmp-events.txt |   12 ------------
 qapi-event.json         |    9 +++++++++
 vl.c                    |    2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

Comments

Eric Blake June 13, 2014, 8:33 p.m. UTC | #1
On 06/05/2014 06:22 AM, Wenchao Xia wrote:
> Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com>
> ---
>  docs/qmp/qmp-events.txt |   12 ------------
>  qapi-event.json         |    9 +++++++++
>  vl.c                    |    2 +-
>  3 files changed, 10 insertions(+), 13 deletions(-)
> 

> +##
> +# @RESUME
> +#
> +# Emitted when the virtual machine resumes execution
> +#
> +# Since: 2.1

0.14.0
diff mbox

Patch

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 af5a18c..3485985 100644
--- a/qapi-event.json
+++ b/qapi-event.json
@@ -38,3 +38,12 @@ 
 # Since: 2.1
 ##
 { 'event': 'STOP' }
+
+##
+# @RESUME
+#
+# Emitted when the virtual machine resumes execution
+#
+# Since: 2.1
+##
+{ 'event': 'RESUME' }
diff --git a/vl.c b/vl.c
index b95fc5e..d195e50 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(NULL);
     }
 }