Commit bff78274 authored by Avi Kivity's avatar Avi Kivity Committed by Marcelo Tosatti
Browse files

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: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent dc77270f

arch/x86/kvm/svm.c

+2 −1
Original line number Diff line number Diff line
@@ -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;