diff options
| author | Eric Blake <eblake@redhat.com> | 2017-05-15 16:41:13 -0500 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-05-23 13:28:17 +0200 |
| commit | cf83f140059f21d4629ae4b61d468c3baef2bb4c (patch) | |
| tree | 4c39ace51dc5ca17a6a3edf9800844b08b55ab1f /hw/acpi | |
| parent | 802f045a5f61b781df55e4492d896b4d20503ba7 (diff) | |
| download | qemu-cf83f140059f21d4629ae4b61d468c3baef2bb4c.zip qemu-cf83f140059f21d4629ae4b61d468c3baef2bb4c.tar.gz qemu-cf83f140059f21d4629ae4b61d468c3baef2bb4c.tar.bz2 | |
shutdown: Add source information to SHUTDOWN and RESET
Time to wire up all the call sites that request a shutdown or
reset to use the enum added in the previous patch.
It would have been less churn to keep the common case with no
arguments as meaning guest-triggered, and only modified the
host-triggered code paths, via a wrapper function, but then we'd
still have to audit that I didn't miss any host-triggered spots;
changing the signature forces us to double-check that I correctly
categorized all callers.
Since command line options can change whether a guest reset request
causes an actual reset vs. a shutdown, it's easy to also add the
information to reset requests.
Signed-off-by: Eric Blake <eblake@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au> [ppc parts]
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> [SPARC part]
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> [s390x parts]
Message-Id: <20170515214114.15442-5-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'hw/acpi')
| -rw-r--r-- | hw/acpi/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/acpi/core.c b/hw/acpi/core.c index e890a5d..95fcac9 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -561,7 +561,7 @@ static void acpi_pm1_cnt_write(ACPIREGS *ar, uint16_t val) uint16_t sus_typ = (val >> 10) & 7; switch(sus_typ) { case 0: /* soft power off */ - qemu_system_shutdown_request(); + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); break; case 1: qemu_system_suspend_request(); @@ -569,7 +569,7 @@ static void acpi_pm1_cnt_write(ACPIREGS *ar, uint16_t val) default: if (sus_typ == ar->pm1.cnt.s4_val) { /* S4 request */ qapi_event_send_suspend_disk(&error_abort); - qemu_system_shutdown_request(); + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); } break; } |