Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c9afa52 authored Jan 30, 2013 by Gleb Natapov Committed by Marcelo Tosatti Feb 04, 2013

KVM: MMU: set base_role.nxe during mmu initialization.



Move base_role.nxe initialisation to where all other roles are initialized.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

parent 9bb4f6b1

arch/x86/kvm/mmu.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -3687,6 +3687,7 @@ int kvm_init_shadow_mmu(struct kvm_vcpu vcpu, struct kvm_mmu context)
		else
		r = paging32_init_context(vcpu, context);

		vcpu->arch.mmu.base_role.nxe = is_nx(vcpu);
		vcpu->arch.mmu.base_role.cr4_pae = !!is_pae(vcpu);
		vcpu->arch.mmu.base_role.cr0_wp = is_write_protection(vcpu);
		vcpu->arch.mmu.base_role.smep_andnot_wp

arch/x86/kvm/x86.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -870,8 +870,6 @@ static int set_efer(struct kvm_vcpu *vcpu, u64 efer)

		kvm_x86_ops->set_efer(vcpu, efer);

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

		/* Update reserved bits */
		if ((efer ^ old_efer) & EFER_NX)
		kvm_mmu_reset_context(vcpu);