From: Zachary Amsden <zamsden@redhat.com>
Date: Thu, 28 Oct 2010 18:48:14 +0000 (-0200)
Subject: KVM: x86: Fix SVM VMCB reset
X-Git-Tag: v2.6.32.26~25
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=60977a7ab5c850828eccad4ce711f499a1918599;p=karo-tx-linux.git

KVM: x86: Fix SVM VMCB reset

commit 58877679fd393d3ef71aa383031ac7817561463d upstream.

On reset, VMCB TSC should be set to zero.  Instead, code was setting
tsc_offset to zero, which passes through the underlying TSC.

Signed-off-by: Zachary Amsden <zamsden@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 925c326cab5b..b15fab64ebd7 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -621,7 +621,7 @@ static void init_vmcb(struct vcpu_svm *svm)
 
 	control->iopm_base_pa = iopm_base;
 	control->msrpm_base_pa = __pa(svm->msrpm);
-	control->tsc_offset = 0;
+	control->tsc_offset = 0-native_read_tsc();
 	control->int_ctl = V_INTR_MASKING_MASK;
 
 	init_seg(&save->es);