---

yaml --- r: 321369 b: refs/heads/master c: 4b64866 h: refs/heads/master i: 321367: 45f82a9 v: v3
git-mirror · Aug 1, 2012 · 1a45865 · 1a45865
1 parent 5b57753
commit 1a45865
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aea218f3cbbcaac249b6b2c98930a00d6d931f1e
+refs/heads/master: 4b6486659a7defef82ea51b276024b3aa357fefc
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
@@ -925,6 +925,10 @@ static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock)
 	 */
 	getboottime(&boot);
 
+	if (kvm->arch.kvmclock_offset) {
+		struct timespec ts = ns_to_timespec(kvm->arch.kvmclock_offset);
+		boot = timespec_sub(boot, ts);
+	}
 	wc.sec = boot.tv_sec;
 	wc.nsec = boot.tv_nsec;
 	wc.version = version;