diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2011-04-14 02:06:27 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-04-14 02:06:27 -0300 |
| commit | 0056c2ccddf717e5551b88b9f20c54134804a2f3 (patch) | |
| tree | 89de26c31b2b62b5361f5d501bba981fc1028263 /target-ppc | |
| parent | e24ce62e4aba5d274b604471fe66d1920f8a4ccd (diff) | |
| parent | 74475455442398a64355428b37422d14ccc293cb (diff) | |
Merge commit '74475455442398a64355428b37422d14ccc293cb' into upstream-merge
* commit '74475455442398a64355428b37422d14ccc293cb':
change all other clock references to use nanosecond resolution accessors
change all rt_clock references to use millisecond resolution accessors
add more helper functions with explicit milli/nanosecond resolution
Fix conversions from pointer to int and vice versa
petalogix_ml605_mmu: remove unused variable
qemu-thread: delete unused functions
w32: Add missing functions qemu_mutex_destroy, qemu_cond_destroy
Conflicts:
hw/i8254.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/kvm.c | 4 | ||||
| -rw-r--r-- | target-ppc/kvm_ppc.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 3924f4bed..faea5dc36 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -85,7 +85,7 @@ int kvm_arch_init_vcpu(CPUState *cenv) sregs.pvr = cenv->spr[SPR_PVR]; ret = kvm_vcpu_ioctl(cenv, KVM_SET_SREGS, &sregs); - idle_timer = qemu_new_timer(vm_clock, kvm_kick_env, cenv); + idle_timer = qemu_new_timer_ns(vm_clock, kvm_kick_env, cenv); return ret; } @@ -246,7 +246,7 @@ void kvm_arch_pre_run(CPUState *env, struct kvm_run *run) printf("cpu %d fail inject %x\n", env->cpu_index, irq); /* Always wake up soon in case the interrupt was level based */ - qemu_mod_timer(idle_timer, qemu_get_clock(vm_clock) + + qemu_mod_timer(idle_timer, qemu_get_clock_ns(vm_clock) + (get_ticks_per_sec() / 50)); } diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c index 6f0468cde..536fcabd4 100644 --- a/target-ppc/kvm_ppc.c +++ b/target-ppc/kvm_ppc.c @@ -89,7 +89,7 @@ void kvmppc_fdt_update(void *fdt) static void kvmppc_timer_hack(void *opaque) { qemu_service_io(); - qemu_mod_timer(kvmppc_timer, qemu_get_clock(vm_clock) + kvmppc_timer_rate); + qemu_mod_timer(kvmppc_timer, qemu_get_clock_ns(vm_clock) + kvmppc_timer_rate); } void kvmppc_init(void) @@ -99,7 +99,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(vm_clock, &kvmppc_timer_hack, NULL); - qemu_mod_timer(kvmppc_timer, qemu_get_clock(vm_clock) + kvmppc_timer_rate); + 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); } |