mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-10 19:14:58 -06:00
change all other clock references to use nanosecond resolution accessors
This was done with: sed -i 's/qemu_get_clock\>/qemu_get_clock_ns/' \ $(git grep -l 'qemu_get_clock\>' ) sed -i 's/qemu_new_timer\>/qemu_new_timer_ns/' \ $(git grep -l 'qemu_new_timer\>' ) after checking that get_clock and new_timer never occur twice on the same line. There were no missed occurrences; however, even if there had been, they would have been caught by the compiler. There was exactly one false positive in qemu_run_timers: - current_time = qemu_get_clock (clock); + current_time = qemu_get_clock_ns (clock); which is of course not in this patch. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
7bd427d801
commit
7447545544
68 changed files with 268 additions and 268 deletions
|
@ -85,7 +85,7 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s);
|
|||
static uint32_t get_pmtmr(PIIX4PMState *s)
|
||||
{
|
||||
uint32_t d;
|
||||
d = muldiv64(qemu_get_clock(vm_clock), PM_TIMER_FREQUENCY, get_ticks_per_sec());
|
||||
d = muldiv64(qemu_get_clock_ns(vm_clock), PM_TIMER_FREQUENCY, get_ticks_per_sec());
|
||||
return d & 0xffffff;
|
||||
}
|
||||
|
||||
|
@ -93,7 +93,7 @@ static int get_pmsts(PIIX4PMState *s)
|
|||
{
|
||||
int64_t d;
|
||||
|
||||
d = muldiv64(qemu_get_clock(vm_clock), PM_TIMER_FREQUENCY,
|
||||
d = muldiv64(qemu_get_clock_ns(vm_clock), PM_TIMER_FREQUENCY,
|
||||
get_ticks_per_sec());
|
||||
if (d >= s->tmr_overflow_time)
|
||||
s->pmsts |= ACPI_BITMASK_TIMER_STATUS;
|
||||
|
@ -149,7 +149,7 @@ static void pm_ioport_write(IORange *ioport, uint64_t addr, unsigned width,
|
|||
pmsts = get_pmsts(s);
|
||||
if (pmsts & val & ACPI_BITMASK_TIMER_STATUS) {
|
||||
/* if TMRSTS is reset, then compute the new overflow time */
|
||||
d = muldiv64(qemu_get_clock(vm_clock), PM_TIMER_FREQUENCY,
|
||||
d = muldiv64(qemu_get_clock_ns(vm_clock), PM_TIMER_FREQUENCY,
|
||||
get_ticks_per_sec());
|
||||
s->tmr_overflow_time = (d + 0x800000LL) & ~0x7fffffLL;
|
||||
}
|
||||
|
@ -413,7 +413,7 @@ static int piix4_pm_initfn(PCIDevice *dev)
|
|||
register_ioport_write(s->smb_io_base, 64, 1, smb_ioport_writeb, &s->smb);
|
||||
register_ioport_read(s->smb_io_base, 64, 1, smb_ioport_readb, &s->smb);
|
||||
|
||||
s->tmr_timer = qemu_new_timer(vm_clock, pm_tmr_timer, s);
|
||||
s->tmr_timer = qemu_new_timer_ns(vm_clock, pm_tmr_timer, s);
|
||||
|
||||
qemu_system_powerdown = *qemu_allocate_irqs(piix4_powerdown, s, 1);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue