From 1a4586593e54ca2e47400775afb2cc2ff3a0cc68 Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Fri, 20 Jul 2012 10:44:24 -0600
Subject: [PATCH] --- yaml --- r: 321369 b: refs/heads/master c:
 4b6486659a7defef82ea51b276024b3aa357fefc h: refs/heads/master i:   321367:
 45f82a9c2a8cfc70cebae255c00ede0fdd77cb5f v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 66750e67d653..256cf5cb95a9 100644
--- 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
index 59b59508ff07..42bce48f6928 100644
--- 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;