aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 6666af840190..ce57cd899a62 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -892,7 +892,7 @@ static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock)
892 892
893 /* 893 /*
894 * The guest calculates current wall clock time by adding 894 * The guest calculates current wall clock time by adding
895 * system time (updated by kvm_write_guest_time below) to the 895 * system time (updated by kvm_guest_time_update below) to the
896 * wall clock specified here. guest system time equals host 896 * wall clock specified here. guest system time equals host
897 * system time for us, thus we must fill in host boot time here. 897 * system time for us, thus we must fill in host boot time here.
898 */ 898 */
@@ -1032,7 +1032,7 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, u64 data)
1032} 1032}
1033EXPORT_SYMBOL_GPL(kvm_write_tsc); 1033EXPORT_SYMBOL_GPL(kvm_write_tsc);
1034 1034
1035static int kvm_write_guest_time(struct kvm_vcpu *v) 1035static int kvm_guest_time_update(struct kvm_vcpu *v)
1036{ 1036{
1037 unsigned long flags; 1037 unsigned long flags;
1038 struct kvm_vcpu_arch *vcpu = &v->arch; 1038 struct kvm_vcpu_arch *vcpu = &v->arch;
@@ -1052,7 +1052,7 @@ static int kvm_write_guest_time(struct kvm_vcpu *v)
1052 local_irq_restore(flags); 1052 local_irq_restore(flags);
1053 1053
1054 if (unlikely(this_tsc_khz == 0)) { 1054 if (unlikely(this_tsc_khz == 0)) {
1055 kvm_make_request(KVM_REQ_KVMCLOCK_UPDATE, v); 1055 kvm_make_request(KVM_REQ_CLOCK_UPDATE, v);
1056 return 1; 1056 return 1;
1057 } 1057 }
1058 1058
@@ -1128,7 +1128,7 @@ static int kvm_request_guest_time_update(struct kvm_vcpu *v)
1128 1128
1129 if (!vcpu->time_page) 1129 if (!vcpu->time_page)
1130 return 0; 1130 return 0;
1131 kvm_make_request(KVM_REQ_KVMCLOCK_UPDATE, v); 1131 kvm_make_request(KVM_REQ_CLOCK_UPDATE, v);
1132 return 1; 1132 return 1;
1133} 1133}
1134 1134
@@ -5041,8 +5041,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
5041 kvm_mmu_unload(vcpu); 5041 kvm_mmu_unload(vcpu);
5042 if (kvm_check_request(KVM_REQ_MIGRATE_TIMER, vcpu)) 5042 if (kvm_check_request(KVM_REQ_MIGRATE_TIMER, vcpu))
5043 __kvm_migrate_timers(vcpu); 5043 __kvm_migrate_timers(vcpu);
5044 if (kvm_check_request(KVM_REQ_KVMCLOCK_UPDATE, vcpu)) { 5044 if (kvm_check_request(KVM_REQ_CLOCK_UPDATE, vcpu)) {
5045 r = kvm_write_guest_time(vcpu); 5045 r = kvm_guest_time_update(vcpu);
5046 if (unlikely(r)) 5046 if (unlikely(r))
5047 goto out; 5047 goto out;
5048 } 5048 }