mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 16:53:55 -06:00
aio / timers: Switch entire codebase to the new timer API
This is an autogenerated patch using scripts/switch-timer-api. Switch the entire code base to using the new timer API. Note this patch may introduce some line length issues. Signed-off-by: Alex Bligh <alex@alex.org.uk> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
fe10ab540b
commit
bc72ad6754
121 changed files with 678 additions and 678 deletions
|
@ -419,7 +419,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
|
|||
return ret;
|
||||
}
|
||||
|
||||
idle_timer = qemu_new_timer_ns(vm_clock, kvm_kick_cpu, cpu);
|
||||
idle_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, kvm_kick_cpu, cpu);
|
||||
|
||||
/* Some targets support access to KVM's guest TLB. */
|
||||
switch (cenv->mmu_model) {
|
||||
|
@ -1136,7 +1136,7 @@ void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run)
|
|||
}
|
||||
|
||||
/* Always wake up soon in case the interrupt was level based */
|
||||
qemu_mod_timer(idle_timer, qemu_get_clock_ns(vm_clock) +
|
||||
timer_mod(idle_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
|
||||
(get_ticks_per_sec() / 50));
|
||||
}
|
||||
|
||||
|
@ -1807,7 +1807,7 @@ int kvmppc_get_htab_fd(bool write)
|
|||
|
||||
int kvmppc_save_htab(QEMUFile *f, int fd, size_t bufsize, int64_t max_ns)
|
||||
{
|
||||
int64_t starttime = qemu_get_clock_ns(rt_clock);
|
||||
int64_t starttime = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
|
||||
uint8_t buf[bufsize];
|
||||
ssize_t rc;
|
||||
|
||||
|
@ -1823,7 +1823,7 @@ int kvmppc_save_htab(QEMUFile *f, int fd, size_t bufsize, int64_t max_ns)
|
|||
}
|
||||
} while ((rc != 0)
|
||||
&& ((max_ns < 0)
|
||||
|| ((qemu_get_clock_ns(rt_clock) - starttime) < max_ns)));
|
||||
|| ((qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - starttime) < max_ns)));
|
||||
|
||||
return (rc == 0) ? 1 : 0;
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ static unsigned int kvmppc_timer_rate;
|
|||
static void kvmppc_timer_hack(void *opaque)
|
||||
{
|
||||
qemu_notify_event();
|
||||
qemu_mod_timer(kvmppc_timer, qemu_get_clock_ns(vm_clock) + kvmppc_timer_rate);
|
||||
timer_mod(kvmppc_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + kvmppc_timer_rate);
|
||||
}
|
||||
|
||||
void kvmppc_init(void)
|
||||
|
@ -34,7 +34,7 @@ void kvmppc_init(void)
|
|||
* run. So, until QEMU gains IO threads, we create this timer to ensure
|
||||
* that the device model gets a chance to run. */
|
||||
kvmppc_timer_rate = get_ticks_per_sec() / 10;
|
||||
kvmppc_timer = qemu_new_timer_ns(vm_clock, &kvmppc_timer_hack, NULL);
|
||||
qemu_mod_timer(kvmppc_timer, qemu_get_clock_ns(vm_clock) + kvmppc_timer_rate);
|
||||
kvmppc_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, &kvmppc_timer_hack, NULL);
|
||||
timer_mod(kvmppc_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + kvmppc_timer_rate);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue