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

Commit c5421519 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: MMU: Eliminate pointless temporary 'ac' 



'ac' essentially reconstructs the 'access' variable we already
have, except for the PFERR_PRESENT_MASK and PFERR_RSVD_MASK.  As
these are not used by callees, just use 'access' directly.

Reviewed-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent b514c30f

arch/x86/kvm/paging_tmpl.h

+1 −4
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, 
	u16 errcode = 0;

	gpa_t real_gpa;

	gfn_t gfn;

	u32 ac;



	trace_kvm_mmu_pagetable_walk(addr, access);

retry_walk:
@@ -242,9 +241,7 @@ retry_walk: 
	if (PTTYPE == 32 && walker->level == PT_DIRECTORY_LEVEL && is_cpuid_PSE36())

		gfn += pse36_gfn_delta(pte);



	ac = write_fault | fetch_fault | user_fault;



	real_gpa = mmu->translate_gpa(vcpu, gfn_to_gpa(gfn), ac);

	real_gpa = mmu->translate_gpa(vcpu, gfn_to_gpa(gfn), access);

	if (real_gpa == UNMAPPED_GVA)

		return 0;