From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz7F7-0003gt-Bi for qemu-devel@nongnu.org; Mon, 23 Jun 2014 12:37:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wz7Ez-0003zr-TH for qemu-devel@nongnu.org; Mon, 23 Jun 2014 12:37:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32499) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz7Ez-0003zZ-L5 for qemu-devel@nongnu.org; Mon, 23 Jun 2014 12:37:09 -0400 From: Luiz Capitulino Date: Mon, 23 Jun 2014 12:36:22 -0400 Message-Id: <1403541403-16468-23-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1403541403-16468-1-git-send-email-lcapitulino@redhat.com> References: <1403541403-16468-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PULL 22/43] qapi event: convert WAKEUP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws From: Wenchao Xia 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 71eff0d..e69042c 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -442,18 +442,6 @@ Example: "host": "127.0.0.1", "sasl_username": "luiz" } }, "timestamp": { "seconds": 1263475302, "microseconds": 150772 } } -WAKEUP ------- - -Emitted when the guest has woken up from S3 and is running. - -Data: None. - -Example: - -{ "event": "WAKEUP", - "timestamp": { "seconds": 1344522075, "microseconds": 745528 } } - WATCHDOG -------- diff --git a/qapi-event.json b/qapi-event.json index 469353c..807a6f5 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -69,3 +69,12 @@ # Since: 1.2 ## { 'event': 'SUSPEND_DISK' } + +## +# @WAKEUP +# +# Emitted when the guest has woken up from suspend state and is running +# +# Since: 1.1 +## +{ 'event': 'WAKEUP' } diff --git a/vl.c b/vl.c index aaa9ee5..4a14681 100644 --- a/vl.c +++ b/vl.c @@ -1987,7 +1987,7 @@ static bool main_loop_should_exit(void) notifier_list_notify(&wakeup_notifiers, &wakeup_reason); wakeup_reason = QEMU_WAKEUP_REASON_NONE; resume_all_vcpus(); - monitor_protocol_event(QEVENT_WAKEUP, NULL); + qapi_event_send_wakeup(&error_abort); } if (qemu_powerdown_requested()) { qemu_system_powerdown(); -- 1.9.3