From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XowWG-00057R-KQ for qemu-devel@nongnu.org; Thu, 13 Nov 2014 10:41:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XowWA-0007qu-UK for qemu-devel@nongnu.org; Thu, 13 Nov 2014 10:41:12 -0500 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]:55969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XowWA-0007qo-Mp for qemu-devel@nongnu.org; Thu, 13 Nov 2014 10:41:06 -0500 Received: by mail-wi0-f179.google.com with SMTP id ex7so1415772wid.6 for ; Thu, 13 Nov 2014 07:41:06 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 13 Nov 2014 16:40:28 +0100 Message-Id: <1415893228-25823-14-git-send-email-pbonzini@redhat.com> In-Reply-To: <1415893228-25823-1-git-send-email-pbonzini@redhat.com> References: <1415893228-25823-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 13/13] acpi: accurate overflow check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Pavel Dovgalyuk From: Pavel Dovgalyuk Compare clock in ns, because acpi_pm_tmr_update uses rounded to ns value instead of ticks. Signed-off-by: Pavel Dovgalyuk [This lets Windows boot in icount mode. - Paolo] Signed-off-by: Paolo Bonzini --- hw/acpi/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index a7368fb..51913d6 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; -- 1.8.3.1