From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9c2-000178-3j for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wx9bt-00034g-2x for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:50 -0400 Received: from mail-we0-x236.google.com ([2a00:1450:400c:c03::236]:39679) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9bs-00034V-RP for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:40 -0400 Received: by mail-we0-f182.google.com with SMTP id q59so340575wes.13 for ; Tue, 17 Jun 2014 23:44:40 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 18 Jun 2014 08:43:40 +0200 Message-Id: <1403073840-32603-17-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403073840-32603-1-git-send-email-pbonzini@redhat.com> References: <1403073840-32603-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2.1 16/36] qapi event: convert WAKEUP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: wenchaoqemu@gmail.com, lcapitulino@redhat.com From: Wenchao Xia Signed-off-by: Wenchao Xia Signed-off-by: Paolo Bonzini --- 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 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 107176c..bcda808 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(&error_abort); } if (qemu_powerdown_requested()) { qemu_system_powerdown(); -- 1.9.3