summaryrefslogtreecommitdiffstats
path: root/hw/acpi.c
diff options
context:
space:
mode:
authorBruce Rogers <brogers@suse.com>2013-04-02 12:41:40 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-03 15:06:44 -0500
commit560e63965232e37d1916a447125cf91c18a96930 (patch)
tree9580094bf8c1d109f25be620e086dd6291bb37d0 /hw/acpi.c
parenta509d632c877f7b5fa07368879b8ae5919a6d345 (diff)
downloadhqemu-560e63965232e37d1916a447125cf91c18a96930.zip
hqemu-560e63965232e37d1916a447125cf91c18a96930.tar.gz
acpi: initialize s4_val used in s4 shutdown
While investigating why a 32 bit Windows 2003 guest wasn't able to successfully perform a shutdown /h, it was discovered that commit afafe4bbe0cf7d3318e1ac7b40925561f86a6bd4 inadvertently dropped the initialization of the s4_val used to handle s4 shutdown. Initialize the value as before. Signed-off-by: Bruce Rogers <brogers@suse.com> Message-id: 1364928100-487-1-git-send-email-brogers@suse.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/acpi.c')
-rw-r--r--hw/acpi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/acpi.c b/hw/acpi.c
index 53e47d5..e9b73cf 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -472,8 +472,9 @@ static const MemoryRegionOps acpi_pm_cnt_ops = {
.endianness = DEVICE_LITTLE_ENDIAN,
};
-void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent)
+void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, uint8_t s4_val)
{
+ ar->pm1.cnt.s4_val = s4_val;
ar->wakeup.notify = acpi_notify_wakeup;
qemu_register_wakeup_notifier(&ar->wakeup);
memory_region_init_io(&ar->pm1.cnt.io, &acpi_pm_cnt_ops, ar, "acpi-cnt", 2);
OpenPOWER on IntegriCloud