From 591c48fbc5390eced7c787a5fbb72552ef62e56a Mon Sep 17 00:00:00 2001 From: Wenchao Xia Date: Wed, 18 Jun 2014 08:43:37 +0200 Subject: [PATCH] qapi event: convert RESUME 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 | 4 ++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index cb32530fbe..fb26a1a39b 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 } } -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 bac7fdc4b0..ac903efec2 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 55fabf80bc..fb9193986d 100644 --- a/vl.c +++ b/vl.c @@ -736,7 +736,7 @@ void vm_start(void) * the STOP event. */ if (runstate_is_running()) { - monitor_protocol_event(QEVENT_STOP, NULL); + qapi_event_send_stop(&error_abort); } else { cpu_enable_ticks(); runstate_set(RUN_STATE_RUNNING); @@ -744,7 +744,7 @@ void vm_start(void) resume_all_vcpus(); } - monitor_protocol_event(QEVENT_RESUME, NULL); + qapi_event_send_resume(&error_abort); }