From: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 21 Jan 2009 16:31:20 +0000 (+0000)
Subject: Always return latest pmsts instead of the old one (Xiantao Zhang)
X-Git-Tag: stefano.display-merge-end~66
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=055479feab63607b8042bb8ebb2e0523f17cbc4e;p=qemu-xen-4.0-testing.git

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>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6375 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/acpi.c b/hw/acpi.c
index 92b1ffa6..c127d4cb 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -92,7 +92,7 @@ static int get_pmsts(PIIX4PMState *s)
     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)