From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9c1-00013x-0N for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wx9br-00034H-Lo for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:48 -0400 Received: from mail-wi0-x236.google.com ([2a00:1450:400c:c05::236]:65411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wx9br-000347-FI for qemu-devel@nongnu.org; Wed, 18 Jun 2014 02:44:39 -0400 Received: by mail-wi0-f182.google.com with SMTP id bs8so511196wib.3 for ; Tue, 17 Jun 2014 23:44:38 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 18 Jun 2014 08:43:39 +0200 Message-Id: <1403073840-32603-16-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 15/36] qapi event: convert SUSPEND_DISK 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 | 14 -------------- hw/acpi/core.c | 4 ++-- qapi-event.json | 12 ++++++++++++ 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt index d86a077..c2f23ef 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -342,20 +342,6 @@ Example: "channel-id": 0, "tls": true} }} -SUSPEND_DISK ------------- - -Emitted when the guest makes a request to enter S4 state. - -Data: None. - -Example: - -{ "event": "SUSPEND_DISK", - "timestamp": { "seconds": 1344456160, "microseconds": 309119 } } - -Note: QEMU shuts down when entering S4 state. - VNC_CONNECTED ------------- diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 79414b4..a7368fb 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -22,11 +22,11 @@ #include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/acpi/acpi.h" -#include "monitor/monitor.h" #include "qemu/config-file.h" #include "qapi/opts-visitor.h" #include "qapi/dealloc-visitor.h" #include "qapi-visit.h" +#include "qapi-event.h" struct acpi_table_header { uint16_t _length; /* our length, not actual part of the hdr */ @@ -550,7 +550,7 @@ static void acpi_pm1_cnt_write(ACPIREGS *ar, uint16_t val) break; default: if (sus_typ == ar->pm1.cnt.s4_val) { /* S4 request */ - monitor_protocol_event(QEVENT_SUSPEND_DISK, NULL); + qapi_event_send_suspend_disk(&error_abort); qemu_system_shutdown_request(); } break; diff --git a/qapi-event.json b/qapi-event.json index d45b341..469353c 100644 --- a/qapi-event.json +++ b/qapi-event.json @@ -57,3 +57,15 @@ # Since: 1.1 ## { 'event': 'SUSPEND' } + +## +# @SUSPEND_DISK +# +# Emitted when guest enters a hardware suspension state with data saved on +# disk, for example, S4 state, which is sometimes called hibernate state +# +# Note: QEMU shuts down (similar to event @SHUTDOWN) when entering this state +# +# Since: 1.2 +## +{ 'event': 'SUSPEND_DISK' } -- 1.9.3