diff options
| author | Wenchao Xia <wenchaoqemu@gmail.com> | 2014-06-18 08:43:39 +0200 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-06-23 11:12:27 -0400 |
| commit | 2ea4100f44af4280c5f566c94ac02f188e8ff24c (patch) | |
| tree | 287bdf89a7ddcdd3b4b3071899f6758bd8fb75b6 | |
| parent | 1d11a95a3e84e01289e07884de37f2eb65c21357 (diff) | |
| download | qemu-2ea4100f44af4280c5f566c94ac02f188e8ff24c.tar.gz | |
qapi event: convert SUSPEND_DISK
Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
| -rw-r--r-- | docs/qmp/qmp-events.txt | 14 | ||||
| -rw-r--r-- | hw/acpi/core.c | 4 | ||||
| -rw-r--r-- | 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 d0b7b990ac..71eff0d406 100644 --- a/docs/qmp/qmp-events.txt +++ b/docs/qmp/qmp-events.txt @@ -352,20 +352,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 79414b44c7..a7368fb242 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 d45b34182d..469353c571 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' } |