summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorZachary Amsden <zamsden@redhat.com>2010-08-19 22:07:18 -1000
committerAvi Kivity <avi@redhat.com>2010-10-11 12:36:07 +0200
commit58877679fd393d3ef71aa383031ac7817561463d (patch)
tree92188d827e4c5f32a2bf68ba88d5bbb9a7870b01 /arch/x86
parent85a331881dd52a93e7d4c57bcaf5486cc8718465 (diff)
downloadlinux-58877679fd393d3ef71aa383031ac7817561463d.tar.gz
linux-58877679fd393d3ef71aa383031ac7817561463d.tar.bz2
linux-58877679fd393d3ef71aa383031ac7817561463d.zip
KVM: x86: Fix SVM VMCB reset
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/svm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index bc5b9b8d4a33..12b502de1369 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -766,7 +766,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);