Commit a3d204e2 authored by Sheng Yang's avatar Sheng Yang Committed by Avi Kivity
Browse files

KVM: x86: Check LMA bit before set_efer 



kvm_x86_ops->set_efer() would execute vcpu->arch.efer = efer, so the
checking of LMA bit didn't work.

Signed-off-by: default avatarSheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent f78e9176

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -709,11 +709,11 @@ static int set_efer(struct kvm_vcpu *vcpu, u64 efer) 
			return 1;

	}



	kvm_x86_ops->set_efer(vcpu, efer);



	efer &= ~EFER_LMA;

	efer |= vcpu->arch.efer & EFER_LMA;



	kvm_x86_ops->set_efer(vcpu, efer);



	vcpu->arch.efer = efer;



	vcpu->arch.mmu.base_role.nxe = (efer & EFER_NX) && !tdp_enabled;