From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KKD9f-00029Z-SM
	for qemu-devel@nongnu.org; Sat, 19 Jul 2008 10:11:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KKD9f-00029L-E8
	for qemu-devel@nongnu.org; Sat, 19 Jul 2008 10:11:23 -0400
Received: from [199.232.76.173] (port=38777 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KKD9f-00029H-An
	for qemu-devel@nongnu.org; Sat, 19 Jul 2008 10:11:23 -0400
Received: from savannah.gnu.org ([199.232.41.3]:55277 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <balrogg@gmail.com>) id 1KKD9f-0002Sx-Ps
	for qemu-devel@nongnu.org; Sat, 19 Jul 2008 10:11:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <balrogg@gmail.com>) id 1KKD9e-00025E-Ir
	for qemu-devel@nongnu.org; Sat, 19 Jul 2008 14:11:22 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1KKD9e-000255-Ae
	for qemu-devel@nongnu.org; Sat, 19 Jul 2008 14:11:22 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1KKD9e-000255-Ae@cvs.savannah.gnu.org>
Date: Sat, 19 Jul 2008 14:11:22 +0000
Subject: [Qemu-devel] [4904] Revert "fix power management timer overflow
	handling" (Avi Kivity).
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4904
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4904
Author:   balrog
Date:     2008-07-19 14:11:22 +0000 (Sat, 19 Jul 2008)

Log Message:
-----------
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>

Modified Paths:
--------------
    trunk/hw/acpi.c

Modified: trunk/hw/acpi.c
===================================================================
--- trunk/hw/acpi.c	2008-07-19 14:09:20 UTC (rev 4903)
+++ trunk/hw/acpi.c	2008-07-19 14:11:22 UTC (rev 4904)
@@ -105,7 +105,6 @@
     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);
     }