ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Pavel Dovgalyuk 2014-11-07 13:31:33 +03:00 committed by Paolo Bonzini
parent f4ec5cd29d
commit 3ef0eab178
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/acpi/core.c
View File

@ -376,8 +376,11 @@ static void acpi_notify_wakeup(Notifier *notifier, void *data)
/* ACPI PM1a EVT */ /* ACPI PM1a EVT */
uint16_t acpi_pm1_evt_get_sts(ACPIREGS *ar) uint16_t acpi_pm1_evt_get_sts(ACPIREGS *ar)
{ {
int64_t d = acpi_pm_tmr_get_clock(); /* Compare ns-clock, not PM timer ticks, because
if (d >= ar->tmr.overflow_time) { 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; ar->pm1.evt.sts |= ACPI_BITMASK_TIMER_STATUS;
} }
return ar->pm1.evt.sts; return ar->pm1.evt.sts;