diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-17 10:38:33 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-17 10:38:33 +0200 |
| commit | 84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0 (patch) | |
| tree | 6774218cb21d5ffbe704d6ad6beadc8559aaed1c /arch/x86/kvm/svm.c | |
| parent | 57e35381bc13e6f18ac1ec255ca61ba1a5103e13 (diff) | |
| parent | aa73aec6c385e2c797ac25cc7ccf0318031de7c8 (diff) | |
| download | linux-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.tar.gz linux-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.tar.bz2 linux-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index bc5b9b8d4a33..81ed28cb36e6 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -766,7 +766,6 @@ 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->int_ctl = V_INTR_MASKING_MASK; init_seg(&save->es); @@ -902,6 +901,7 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) svm->vmcb_pa = page_to_pfn(page) << PAGE_SHIFT; svm->asid_generation = 0; init_vmcb(svm); + svm->vmcb->control.tsc_offset = 0-native_read_tsc(); err = fx_init(&svm->vcpu); if (err) |