Commit 6dc696d4 authored by Zachary Amsden's avatar Zachary Amsden Committed by Avi Kivity
Browse files

KVM: SVM: Fix EFER.LME being stripped 



Must set VCPU register to be the guest notion of EFER even if that
setting is not valid on hardware.  This was masked by the set in
set_efer until 7657fd5ace88e8092f5f3a84117e093d7b893f26 broke that.
Fix is simply to set the VCPU register before stripping bits.

Signed-off-by: default avatarZachary Amsden <zamsden@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 01c168ac

arch/x86/kvm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -286,11 +286,11 @@ static inline void flush_guest_tlb(struct kvm_vcpu *vcpu) 


static void svm_set_efer(struct kvm_vcpu *vcpu, u64 efer)

{

	vcpu->arch.efer = efer;

	if (!npt_enabled && !(efer & EFER_LMA))

		efer &= ~EFER_LME;



	to_svm(vcpu)->vmcb->save.efer = efer | EFER_SVME;

	vcpu->arch.efer = efer;

}



static int is_external_interrupt(u32 info)