[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2.1 13/36] qapi event: convert RESUME
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 2.1 13/36] qapi event: convert RESUME |
Date: |
Wed, 18 Jun 2014 08:43:37 +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 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] [PATCH 2.1 07/36] monitor: add an implemention of qapi event emit method, (continued)
- [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, 2014/06/18
- [Qemu-devel] [PATCH 2.1 13/36] qapi event: convert RESUME,
Paolo Bonzini <=
- [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