From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9bz-00011s-9M for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wx9bq-00033z-9M for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:47 -0400 Received: from mail-wi0-x231.google.com ([2a00:1450:400c:c05::231]:64382) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9bq-00033n-1k for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:38 -0400 Received: by mail-wi0-f177.google.com with SMTP id r20so505061wiv.10 for ; Tue, 17 Jun 2014 23:44:37 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 18 Jun 2014 08:43:38 +0200 Message-Id: <1403073840-32603-15-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 14/36] qapi event: convert SUSPEND 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 | 10 ++++++++++ vl.c | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index cda67d4..d86a077 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -342,18 +342,6 @@ Example: "channel-id": 0, "tls": true} }} -SUSPEND -------- - -Emitted when guest enters S3 state. - -Data: None. - -Example: - -{ "event": "SUSPEND", - "timestamp": { "seconds": 1344456160, "microseconds": 309119 } } - SUSPEND_DISK ------------ diff --git a/qapi-event.json b/qapi-event.json index ac903ef..d45b341 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -47,3 +47,13 @@ # Since: 0.12.0 ## { 'event': 'RESUME' } + +## +# @SUSPEND +# +# Emitted when guest enters a hardware suspension state, for example, S3 state, +# which is sometimes called standby state +# +# Since: 1.1 +## +{ 'event': 'SUSPEND' } diff --git a/vl.c b/vl.c index 3d56d40..107176c 100644 --- a/vl.c +++ b/vl.c @@ -1928,7 +1928,7 @@ static void qemu_system_suspend(void) pause_all_vcpus(); notifier_list_notify(&suspend_notifiers, NULL); runstate_set(RUN_STATE_SUSPENDED); - monitor_protocol_event(QEVENT_SUSPEND, NULL); + qapi_event_send_suspend(&error_abort); } void qemu_system_suspend_request(void) -- 1.9.3