From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Date: Fri, 7 Nov 2014 10:31:33 +0000 (+0300)
Subject: acpi: accurate overflow check
X-Git-Tag: v2.2.0-rc2~13^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ef0eab178e5120a0e1c079d163d5c71689d9b71;p=thirdparty%2Fqemu.git

acpi: accurate overflow check

Compare clock in ns, because acpi_pm_tmr_update uses rounded
to ns value instead of ticks.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
[This lets Windows boot in icount mode. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index a7368fb242f..51913d6932e 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -376,8 +376,11 @@ static void acpi_notify_wakeup(Notifier *notifier, void *data)
 /* ACPI PM1a EVT */
 uint16_t acpi_pm1_evt_get_sts(ACPIREGS *ar)
 {
-    int64_t d = acpi_pm_tmr_get_clock();
-    if (d >= ar->tmr.overflow_time) {
+    /* Compare ns-clock, not PM timer ticks, because
+       acpi_pm_tmr_update function uses ns for setting the timer. */
+    int64_t d = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
+    if (d >= muldiv64(ar->tmr.overflow_time,
+                      get_ticks_per_sec(), PM_TIMER_FREQUENCY)) {
         ar->pm1.evt.sts |= ACPI_BITMASK_TIMER_STATUS;
     }
     return ar->pm1.evt.sts;