[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2.1 11/36] qapi event: convert RESET
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 2.1 11/36] qapi event: convert RESET |
Date: |
Wed, 18 Jun 2014 08:43:35 +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 ff2f30d..20e3151 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 } }
-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 9ade3cb..097fa65 100644
--- a/vl.c
+++ b/vl.c
@@ -1907,7 +1907,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] [PATCH 2.1 05/36] test: add test cases for qapi event, (continued)
- [Qemu-devel] [PATCH 2.1 05/36] test: add test cases for qapi event, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 08/36] qapi: add new schema file qapi-event.json, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 03/36] qapi: add event helper functions, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PATCH 2.1 06/36] qapi: adjust existing defines, Paolo Bonzini, 2014/06/18
- [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 <=
- [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, 2014/06/18
- [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