diff options
| author | Jaswinder Singh Rajput | 2009-05-15 15:12:05 +0200 |
|---|---|---|
| committer | Avi Kivity | 2009-09-10 07:32:38 +0200 |
| commit | af24a4e4aec77ef16c1971cf4465f767ba946034 (patch) | |
| tree | e879b6a272affd8af9e26d008d9af7050921d69e /arch/x86/kvm/x86.c | |
| parent | KVM: VMX: Properly handle software interrupt re-injection in real mode (diff) | |
| download | kernel-qcow2-linux-af24a4e4aec77ef16c1971cf4465f767ba946034.tar.gz kernel-qcow2-linux-af24a4e4aec77ef16c1971cf4465f767ba946034.tar.xz kernel-qcow2-linux-af24a4e4aec77ef16c1971cf4465f767ba946034.zip | |
KVM: Replace MSR_IA32_TIME_STAMP_COUNTER with MSR_IA32_TSC of msr-index.h
Use standard msr-index.h's MSR declaration.
MSR_IA32_TSC is better than MSR_IA32_TIME_STAMP_COUNTER as it also solves
80 column issue.
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 3d4529011828..6d46079a901c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -466,7 +466,7 @@ static u32 msrs_to_save[] = { #ifdef CONFIG_X86_64 MSR_CSTAR, MSR_KERNEL_GS_BASE, MSR_SYSCALL_MASK, MSR_LSTAR, #endif - MSR_IA32_TIME_STAMP_COUNTER, MSR_KVM_SYSTEM_TIME, MSR_KVM_WALL_CLOCK, + MSR_IA32_TSC, MSR_KVM_SYSTEM_TIME, MSR_KVM_WALL_CLOCK, MSR_IA32_PERF_STATUS, MSR_IA32_CR_PAT, MSR_VM_HSAVE_PA }; @@ -644,8 +644,7 @@ static void kvm_write_guest_time(struct kvm_vcpu *v) /* Keep irq disabled to prevent changes to the clock */ local_irq_save(flags); - kvm_get_msr(v, MSR_IA32_TIME_STAMP_COUNTER, - &vcpu->hv_clock.tsc_timestamp); + kvm_get_msr(v, MSR_IA32_TSC, &vcpu->hv_clock.tsc_timestamp); ktime_get_ts(&ts); local_irq_restore(flags); |