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

Commit b36c7a7c authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: MMU: cleanup for FNAME(fetch) 



gw->pte_access is the final access permission, since it is unified with
gw->pt_access when we walked guest page table:

FNAME(walk_addr_generic):
	pte_access = pt_access & FNAME(gpte_access)(vcpu, pte, true);

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 640d9b0d

arch/x86/kvm/paging_tmpl.h

+2 −2
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
	if (!is_present_gpte(gw->ptes[gw->level - 1]))

		return NULL;



	direct_access = gw->pt_access & gw->pte_access;

	direct_access = gw->pte_access;



	top_level = vcpu->arch.mmu.root_level;

	if (top_level == PT32E_ROOT_LEVEL)
@@ -537,7 +537,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
		link_shadow_page(it.sptep, sp);

	}



	mmu_set_spte(vcpu, it.sptep, access, gw->pte_access & access,

	mmu_set_spte(vcpu, it.sptep, access, gw->pte_access,

		     user_fault, write_fault, ptwrite, it.level,

		     gw->gfn, pfn, prefault, map_writable);

	FNAME(pte_prefetch)(vcpu, gw, it.sptep);