From: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 19 Jul 2008 14:11:22 +0000 (+0000)
Subject: Revert "fix power management timer overflow handling" (Avi Kivity).
X-Git-Tag: stefano.display-merge-start~885
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=82258945ef2cc4a4ec7cdcef02e751bd30cb199f;p=qemu-xen-4.4-testing.git

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
---

diff --git a/hw/acpi.c b/hw/acpi.c
index e21ded0c2..ef0e0978d 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);
     }