From 7802b4eb8dee42436603d495e4d806a11d060679 Mon Sep 17 00:00:00 2001 From: Xiantao Zhang <xiantao.zhang@intel.com> Date: Wed, 21 Jan 2009 16:31:20 +0000 Subject: [PATCH 65/70] Always return latest pmsts instead of the old one 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> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> RH-Upstream-status: applied(kvm/master) Acked-by: Marcelo Tosatti <mtosatti@redhat.com> --- qemu/hw/acpi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/qemu/hw/acpi.c b/qemu/hw/acpi.c index 281ae9e..86d030d 100644 --- a/qemu/hw/acpi.c +++ b/qemu/hw/acpi.c @@ -94,7 +94,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) -- 1.6.1