From a6330785f025d038b8a6facfb769817f6bf27df6 Mon Sep 17 00:00:00 2001 From: Wenchao Xia Date: Wed, 18 Jun 2014 08:43:35 +0200 Subject: qapi event: convert RESET Signed-off-by: Wenchao Xia Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake Signed-off-by: Luiz Capitulino --- 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 c16d6f19af..c50b18f6fa 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 ca08289aec..f38669d48f 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 abb56d33d0..55fabf80bc 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(); } -- cgit v1.2.1