diff options
| author | Avi Kivity | 2010-01-07 12:16:08 +0100 |
|---|---|---|
| committer | Marcelo Tosatti | 2010-03-01 16:35:51 +0100 |
| commit | bff7827479ed004c0394e6e7b35ae601bb1a97ad (patch) | |
| tree | 663d7edae1086ad6924afce97fac070153aa5a15 /arch/x86/kvm/svm.c | |
| parent | KVM: SVM: Fix SVM_CR0_SELECTIVE_MASK (diff) | |
| download | kernel-qcow2-linux-bff7827479ed004c0394e6e7b35ae601bb1a97ad.tar.gz kernel-qcow2-linux-bff7827479ed004c0394e6e7b35ae601bb1a97ad.tar.xz kernel-qcow2-linux-bff7827479ed004c0394e6e7b35ae601bb1a97ad.zip | |
KVM: SVM: Initialize fpu_active in init_vmcb()
init_vmcb() sets up the intercepts as if the fpu is active, so initialize it
there. This avoids an INIT from setting up intercepts inconsistent with
fpu_active.
Acked-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 5b336a80f31e..949990e4a22e 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -540,6 +540,8 @@ static void init_vmcb(struct vcpu_svm *svm) struct vmcb_control_area *control = &svm->vmcb->control; struct vmcb_save_area *save = &svm->vmcb->save; + svm->vcpu.fpu_active = 1; + control->intercept_cr_read = INTERCEPT_CR0_MASK | INTERCEPT_CR3_MASK | INTERCEPT_CR4_MASK; @@ -730,7 +732,6 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) init_vmcb(svm); fx_init(&svm->vcpu); - svm->vcpu.fpu_active = 1; svm->vcpu.arch.apic_base = 0xfee00000 | MSR_IA32_APICBASE_ENABLE; if (kvm_vcpu_is_bsp(&svm->vcpu)) svm->vcpu.arch.apic_base |= MSR_IA32_APICBASE_BSP; |