summaryrefslogtreecommitdiffstats
path: root/hw/acpi.c
diff options
context:
space:
mode:
authorbalrog2008-07-19 16:11:22 +0200
committerbalrog2008-07-19 16:11:22 +0200
commit82258945ef2cc4a4ec7cdcef02e751bd30cb199f (patch)
treeb0b9fc69e38c9ff97151e91fb14891ac39e41b68 /hw/acpi.c
parentForce screen resize if no buffer set (Avi Kivity). (diff)
downloadqemu-82258945ef2cc4a4ec7cdcef02e751bd30cb199f.tar.gz
qemu-82258945ef2cc4a4ec7cdcef02e751bd30cb199f.tar.xz
qemu-82258945ef2cc4a4ec7cdcef02e751bd30cb199f.zip
Revert "fix power management timer overflow handling" (Avi Kivity).
The fix is bogus, causing sci to be deferred for longer and longer. Noticed by Alex Williamson. Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4904 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/acpi.c')
-rw-r--r--hw/acpi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/acpi.c b/hw/acpi.c
index e21ded0c22..ef0e0978dd 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -105,7 +105,6 @@ static void pm_update_sci(PIIX4PMState *s)
if ((s->pmen & TMROF_EN) && !(pmsts & TMROF_EN)) {
expire_time = muldiv64(s->tmr_overflow_time, ticks_per_sec, PM_FREQ);
qemu_mod_timer(s->tmr_timer, expire_time);
- s->tmr_overflow_time += 0x800000;
} else {
qemu_del_timer(s->tmr_timer);
}