From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LPfzA-0008L1-76
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 11:31:24 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LPfz9-0008Kp-QT
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 11:31:23 -0500
Received: from [199.232.76.173] (port=53582 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LPfz9-0008Kl-Jg
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 11:31:23 -0500
Received: from savannah.gnu.org ([199.232.41.3]:60482 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 <INVALID.NOREPLY@gnu.org>)
	id 1LPfz9-0000SB-9a
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 11:31:23 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LPfz8-0008DX-I1
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 16:31:22 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LPfz8-0008DS-0W
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 16:31:22 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LPfz8-0008DS-0W@cvs.savannah.gnu.org>
Date: Wed, 21 Jan 2009 16:31:22 +0000
Subject: [Qemu-devel] [6375] Always return latest pmsts instead of the old
	one (Xiantao Zhang)
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: 6375
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6375
Author:   aliguori
Date:     2009-01-21 16:31:20 +0000 (Wed, 21 Jan 2009)

Log Message:
-----------
Always return latest pmsts instead of the old one (Xiantao Zhang)

It may lead to the issue when booting windows guests with acpi=1
if return the old pmsts.

Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.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	2009-01-21 03:02:52 UTC (rev 6374)
+++ trunk/hw/acpi.c	2009-01-21 16:31:20 UTC (rev 6375)
@@ -92,7 +92,7 @@
     d = muldiv64(qemu_get_clock(vm_clock), PM_FREQ, ticks_per_sec);
     if (d >= s->tmr_overflow_time)
         s->pmsts |= TMROF_EN;
-    return pmsts;
+    return s->pmsts;
 }
 
 static void pm_update_sci(PIIX4PMState *s)