Commit 1d4a7372 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Rename 'hlevel' to 'level' in FNAME(fetch) 



Rename 'hlevel', which presumably stands for 'host level', to simply
'level' in FNAME(fetch).  The variable hasn't tracked the host level for
quite some time.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200923183735.584-7-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 5bcaf3e1

arch/x86/kvm/mmu/paging_tmpl.h

+5 −5
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gpa_t addr, 
	struct kvm_mmu_page *sp = NULL;

	struct kvm_shadow_walk_iterator it;

	unsigned direct_access, access = gw->pt_access;

	int top_level, hlevel, req_level, ret;

	int top_level, level, req_level, ret;

	gfn_t base_gfn = gw->gfn;



	direct_access = gw->pte_access;
@@ -682,7 +682,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gpa_t addr, 
			link_shadow_page(vcpu, it.sptep, sp);

	}



	hlevel = kvm_mmu_hugepage_adjust(vcpu, gw->gfn, max_level, &pfn,

	level = kvm_mmu_hugepage_adjust(vcpu, gw->gfn, max_level, &pfn,

					huge_page_disallowed, &req_level);



	trace_kvm_mmu_spte_requested(addr, gw->level, pfn);
@@ -694,10 +694,10 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gpa_t addr, 
		 * We cannot overwrite existing page tables with an NX

		 * large page, as the leaf could be executable.

		 */

		disallowed_hugepage_adjust(it, gw->gfn, &pfn, &hlevel);

		disallowed_hugepage_adjust(it, gw->gfn, &pfn, &level);



		base_gfn = gw->gfn & ~(KVM_PAGES_PER_HPAGE(it.level) - 1);

		if (it.level == hlevel)

		if (it.level == level)

			break;



		validate_direct_spte(vcpu, it.sptep, direct_access);