diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2011-03-21 21:28:38 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-03-21 21:28:38 +0100 |
| commit | aa315f95b7c3c5b032cbc6c78f434a871002f558 (patch) | |
| tree | 61c0142bd9a3f43aa6f800fcaebc2e1f0ccf5f5b /target-ppc | |
| parent | 32465727627711ff3e1cde6777a014413c3cb9ee (diff) | |
| parent | 6d5ad9bf9318b1555d5567cd7e1760a51a55ebf8 (diff) | |
Merge branch 'for-anthony' of git://github.com/bonzini/qemu
* 'for-anthony' of git://github.com/bonzini/qemu:
remove qemu_get_clock
add a generic scaling mechanism for timers
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
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 bd4012a4ec..31345907d5 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 @@ int 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 6f0468cdec..536fcabd41 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); } |