diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2015-04-29 15:20:14 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-06-04 11:25:42 +0200 |
| commit | 9a10bbb4e83b184faef6fa744396a6775283c0aa (patch) | |
| tree | 4cdec0c77decfa470f79ddbeea91885575eac814 /hw/acpi/core.c | |
| parent | b5d3b039221f056befb3715471fee1f68214815c (diff) | |
| download | focaccia-qemu-9a10bbb4e83b184faef6fa744396a6775283c0aa.tar.gz focaccia-qemu-9a10bbb4e83b184faef6fa744396a6775283c0aa.zip | |
hw/acpi: acpi_pm1_cnt_init(): take "disable_s3" and "disable_s4"
This patch only modifies the function prototype and updates all chipset code that calls acpi_pm1_cnt_init() to pass in their own disable_s3 and disable_s4 settings. vt82c686 is assumed to be fixed "S3 and S4 enabled". RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1204696 Cc: Amit Shah <amit.shah@redhat.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Eduardo Habkost <ehabkost@redhat.com> Cc: Aurelien Jarno <aurelien@aurel32.net> Cc: Leon Alrae <leon.alrae@imgtec.com> Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'hw/acpi/core.c')
| -rw-r--r-- | hw/acpi/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 8623993c16..c165096d3f 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -592,7 +592,8 @@ static const MemoryRegionOps acpi_pm_cnt_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; -void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, uint8_t s4_val) +void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, + bool disable_s3, bool disable_s4, uint8_t s4_val) { ar->pm1.cnt.s4_val = s4_val; ar->wakeup.notify = acpi_notify_wakeup; |