TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: x86/mmu: Use MMU's role to determine PTTYPE

Browse Source 
Use the MMU's role instead of vCPU state or role_regs to determine the
PTTYPE, i.e. which helpers to wire up.

No functional change intended.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20210622175739.3610207-47-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson
2021-06-22 10:57:31 -07:00
committed by Paolo Bonzini
parent fe660f7244
commit 36f267871e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/x86/kvm/mmu/mmu.c
+4 -4
View File
@@ -4637,9 +4637,9 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu)
context->inject_page_fault = kvm_inject_page_fault;
context->root_level = role_regs_to_root_level(&regs);
if (!is_paging(vcpu))
if (!is_cr0_pg(context))
context->gva_to_gpa = nonpaging_gva_to_gpa;
else if (is_pae(vcpu))
else if (is_cr4_pae(context))
context->gva_to_gpa = paging64_gva_to_gpa;
else
context->gva_to_gpa = paging32_gva_to_gpa;
@@ -4689,9 +4689,9 @@ static void shadow_mmu_init_context(struct kvm_vcpu *vcpu, struct kvm_mmu *conte
context->mmu_role.as_u64 = new_role.as_u64;
if (!____is_cr0_pg(regs))
if (!is_cr0_pg(context))
nonpaging_init_context(context);
else if (____is_cr4_pae(regs))
else if (is_cr4_pae(context))
paging64_init_context(context);
else
paging32_init_context(context);