[v2,7/7] Tell the guest we'll warn it about tsc stability

Commit Message

Glauber Costa May 3, 2010, 3:52 p.m. UTC

None

Patch

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8a7cdda..63a2acc 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -855,6 +855,8 @@  static void kvm_write_guest_time(struct kvm_vcpu *v)
 	vcpu->hv_clock.system_time = ts.tv_nsec +
 				     (NSEC_PER_SEC * (u64)ts.tv_sec) + v->kvm->arch.kvmclock_offset;
 
+	vcpu->hv_clock.flags = 0;
+
 	/*
 	 * The interface expects us to write an even number signaling that the
 	 * update is finished. Since the guest won't see the intermediate
@@ -1983,7 +1985,8 @@  static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
 	case 0x40000001:
 		entry->eax = (1 << KVM_FEATURE_CLOCKSOURCE) |
 		(1 << KVM_FEATURE_NOP_IO_DELAY) |
-		(1 << KVM_FEATURE_CLOCKSOURCE2);
+		(1 << KVM_FEATURE_CLOCKSOURCE2) |
+		(1 << KVM_FEATURE_CLOCKSOURCE_STABLE_TSC);
 		break;
 	case 0x80000000:
 		entry->eax = min(entry->eax, 0x8000001a);