aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2010-05-11 12:17:46 -0400
committerAvi Kivity <avi@redhat.com>2010-05-19 04:41:06 -0400
commit371bcf646d170ee1325abaf4f3e73485b4fd4d2d (patch)
tree1c49e8b04ffb6f8aec7655293b71d7740b9c2d47
parent3a0d7256a6fb8c13f9fac6cd63250f97a8f0d8de (diff)
KVM: x86: Tell the guest we'll warn it about tsc stability
This patch puts up the flag that tells the guest that we'll warn it about the tsc being trustworthy or not. By now, we also say it is not. Signed-off-by: Glauber Costa <glommer@redhat.com> Acked-by: Zachary Amsden <zamsden@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--arch/x86/kvm/x86.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 419c4512e270..474a27fc42df 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -857,6 +857,8 @@ static void kvm_write_guest_time(struct kvm_vcpu *v)
857 vcpu->hv_clock.system_time = ts.tv_nsec + 857 vcpu->hv_clock.system_time = ts.tv_nsec +
858 (NSEC_PER_SEC * (u64)ts.tv_sec) + v->kvm->arch.kvmclock_offset; 858 (NSEC_PER_SEC * (u64)ts.tv_sec) + v->kvm->arch.kvmclock_offset;
859 859
860 vcpu->hv_clock.flags = 0;
861
860 /* 862 /*
861 * The interface expects us to write an even number signaling that the 863 * The interface expects us to write an even number signaling that the
862 * update is finished. Since the guest won't see the intermediate 864 * update is finished. Since the guest won't see the intermediate
@@ -1984,7 +1986,8 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
1984 case KVM_CPUID_FEATURES: 1986 case KVM_CPUID_FEATURES:
1985 entry->eax = (1 << KVM_FEATURE_CLOCKSOURCE) | 1987 entry->eax = (1 << KVM_FEATURE_CLOCKSOURCE) |
1986 (1 << KVM_FEATURE_NOP_IO_DELAY) | 1988 (1 << KVM_FEATURE_NOP_IO_DELAY) |
1987 (1 << KVM_FEATURE_CLOCKSOURCE2); 1989 (1 << KVM_FEATURE_CLOCKSOURCE2) |
1990 (1 << KVM_FEATURE_CLOCKSOURCE_STABLE_BIT);
1988 entry->ebx = 0; 1991 entry->ebx = 0;
1989 entry->ecx = 0; 1992 entry->ecx = 0;
1990 entry->edx = 0; 1993 entry->edx = 0;