diff options
| author | Marcelo Tosatti | 2012-11-28 02:28:58 +0100 |
|---|---|---|
| committer | Marcelo Tosatti | 2012-11-28 02:29:11 +0100 |
| commit | 886b470cb14733a0286e365c77f1844c240c33a4 (patch) | |
| tree | a62f7af3ef4df07d7c1f9f949f0fc2007178ba0e /arch/x86/kvm/x86.c | |
| parent | x86: vdso: pvclock gettime support (diff) | |
| download | kernel-qcow2-linux-886b470cb14733a0286e365c77f1844c240c33a4.tar.gz kernel-qcow2-linux-886b470cb14733a0286e365c77f1844c240c33a4.tar.xz kernel-qcow2-linux-886b470cb14733a0286e365c77f1844c240c33a4.zip | |
KVM: x86: pass host_tsc to read_l1_tsc
Allow the caller to pass host tsc value to kvm_x86_ops->read_l1_tsc().
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1dfe9d318734..1155059c512e 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1150,7 +1150,7 @@ static int kvm_guest_time_update(struct kvm_vcpu *v) /* Keep irq disabled to prevent changes to the clock */ local_irq_save(flags); - tsc_timestamp = kvm_x86_ops->read_l1_tsc(v); + tsc_timestamp = kvm_x86_ops->read_l1_tsc(v, native_read_tsc()); kernel_ns = get_kernel_ns(); this_tsc_khz = __get_cpu_var(cpu_tsc_khz); if (unlikely(this_tsc_khz == 0)) { @@ -5338,7 +5338,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) if (hw_breakpoint_active()) hw_breakpoint_restore(); - vcpu->arch.last_guest_tsc = kvm_x86_ops->read_l1_tsc(vcpu); + vcpu->arch.last_guest_tsc = kvm_x86_ops->read_l1_tsc(vcpu, + native_read_tsc()); vcpu->mode = OUTSIDE_GUEST_MODE; smp_wmb(); |