From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsWjb-00014s-PL for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:25:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsWjS-0001iQ-OR for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:25:31 -0400 Received: from mail-pd0-x229.google.com ([2607:f8b0:400e:c02::229]:54452) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsWjS-0001hu-HN for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:25:22 -0400 Received: by mail-pd0-f169.google.com with SMTP id w10so1034119pde.0 for ; Thu, 05 Jun 2014 05:25:21 -0700 (PDT) From: Wenchao Xia Date: Thu, 5 Jun 2014 05:22:10 -0700 Message-Id: <1401970944-18735-16-git-send-email-wenchaoqemu@gmail.com> In-Reply-To: <1401970944-18735-1-git-send-email-wenchaoqemu@gmail.com> References: <1401970944-18735-1-git-send-email-wenchaoqemu@gmail.com> Subject: [Qemu-devel] [PATCH V6 15/29] qapi event: convert WAKEUP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, armbru@redhat.com, Wenchao Xia , lcapitulino@redhat.com Signed-off-by: Wenchao Xia --- 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 c2f23ef..3d82db4 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -432,18 +432,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 c68edfd..32ac571 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -69,3 +69,12 @@ # Since: 2.1 ## { 'event': 'SUSPEND_DISK' } + +## +# @WAKEUP +# +# Emitted when the guest has woken up from suspend state and is running +# +# Since: 2.1 +## +{ 'event': 'WAKEUP' } diff --git a/vl.c b/vl.c index c6cb2c1..b8ad1df 100644 --- a/vl.c +++ b/vl.c @@ -2052,7 +2052,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(NULL); } if (qemu_powerdown_requested()) { qemu_system_powerdown(); -- 1.7.1