[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/43] qapi event: convert RESET
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 17/43] qapi event: convert RESET |
Date: |
Mon, 23 Jun 2014 12:36:17 -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 c16d6f1..c50b18f 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 } }
-RESET
------
-
-Emitted when the Virtual Machine is reseted.
-
-Data: None.
-
-Example:
-
-{ "event": "RESET",
- "timestamp": { "seconds": 1267041653, "microseconds": 9518 } }
-
RESUME
------
diff --git a/qapi-event.json b/qapi-event.json
index ca08289..f38669d 100644
--- a/qapi-event.json
+++ b/qapi-event.json
@@ -20,3 +20,12 @@
# Since: 0.12.0
##
{ 'event': 'POWERDOWN' }
+
+##
+# @RESET
+#
+# Emitted when the virtual machine is reset
+#
+# Since: 0.12.0
+##
+{ 'event': 'RESET' }
diff --git a/vl.c b/vl.c
index abb56d3..55fabf8 100644
--- a/vl.c
+++ b/vl.c
@@ -1848,7 +1848,7 @@ void qemu_system_reset(bool report)
qemu_devices_reset();
}
if (report) {
- monitor_protocol_event(QEVENT_RESET, NULL);
+ qapi_event_send_reset(&error_abort);
}
cpu_synchronize_all_post_reset();
}
--
1.9.3
- [Qemu-devel] [PULL 02/43] audio: fmopl: drop INLINE macro, (continued)
- [Qemu-devel] [PULL 02/43] audio: fmopl: drop INLINE macro, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 06/43] json-lexer: fix escaped backslash in single-quoted string, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 03/43] qapi: fix coding style in parameters list, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 07/43] os-posix: include sys/time.h, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 08/43] qapi: Add includes from qapi/ as dependencies, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 12/43] qapi: adjust existing defines, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 13/43] monitor: add an implemention of qapi event emit method, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 14/43] qapi: add new schema file qapi-event.json, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 20/43] qapi event: convert SUSPEND, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 11/43] test: add test cases for qapi event, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 17/43] qapi event: convert RESET,
Luiz Capitulino <=
- [Qemu-devel] [PULL 18/43] qapi event: convert STOP, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 22/43] qapi event: convert WAKEUP, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 23/43] qapi event: convert RTC_CHANGE, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 15/43] qapi event: convert SHUTDOWN, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 27/43] qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 26/43] qapi event: convert DEVICE_TRAY_MOVED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 32/43] qapi event: convert SPICE events, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 28/43] qapi event: convert BLOCK_IMAGE_CORRUPTED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 30/43] qapi event: convert NIC_RX_FILTER_CHANGED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 31/43] qapi event: convert VNC events, Luiz Capitulino, 2014/06/23