diff options
Diffstat (limited to 'arch/x86/kvm/mmu.c')
-rw-r--r-- | arch/x86/kvm/mmu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 8e8da7960dbe..f1b36cf3e3d0 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
@@ -2770,7 +2770,7 @@ static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu) | |||
2770 | 2770 | ||
2771 | ASSERT(!VALID_PAGE(root)); | 2771 | ASSERT(!VALID_PAGE(root)); |
2772 | if (vcpu->arch.mmu.root_level == PT32E_ROOT_LEVEL) { | 2772 | if (vcpu->arch.mmu.root_level == PT32E_ROOT_LEVEL) { |
2773 | pdptr = kvm_pdptr_read_mmu(vcpu, &vcpu->arch.mmu, i); | 2773 | pdptr = vcpu->arch.mmu.get_pdptr(vcpu, i); |
2774 | if (!is_present_gpte(pdptr)) { | 2774 | if (!is_present_gpte(pdptr)) { |
2775 | vcpu->arch.mmu.pae_root[i] = 0; | 2775 | vcpu->arch.mmu.pae_root[i] = 0; |
2776 | continue; | 2776 | continue; |
@@ -3318,6 +3318,7 @@ static int init_kvm_tdp_mmu(struct kvm_vcpu *vcpu) | |||
3318 | context->direct_map = true; | 3318 | context->direct_map = true; |
3319 | context->set_cr3 = kvm_x86_ops->set_tdp_cr3; | 3319 | context->set_cr3 = kvm_x86_ops->set_tdp_cr3; |
3320 | context->get_cr3 = get_cr3; | 3320 | context->get_cr3 = get_cr3; |
3321 | context->get_pdptr = kvm_pdptr_read; | ||
3321 | context->inject_page_fault = kvm_inject_page_fault; | 3322 | context->inject_page_fault = kvm_inject_page_fault; |
3322 | context->nx = is_nx(vcpu); | 3323 | context->nx = is_nx(vcpu); |
3323 | 3324 | ||
@@ -3376,6 +3377,7 @@ static int init_kvm_softmmu(struct kvm_vcpu *vcpu) | |||
3376 | 3377 | ||
3377 | vcpu->arch.walk_mmu->set_cr3 = kvm_x86_ops->set_cr3; | 3378 | vcpu->arch.walk_mmu->set_cr3 = kvm_x86_ops->set_cr3; |
3378 | vcpu->arch.walk_mmu->get_cr3 = get_cr3; | 3379 | vcpu->arch.walk_mmu->get_cr3 = get_cr3; |
3380 | vcpu->arch.walk_mmu->get_pdptr = kvm_pdptr_read; | ||
3379 | vcpu->arch.walk_mmu->inject_page_fault = kvm_inject_page_fault; | 3381 | vcpu->arch.walk_mmu->inject_page_fault = kvm_inject_page_fault; |
3380 | 3382 | ||
3381 | return r; | 3383 | return r; |
@@ -3386,6 +3388,7 @@ static int init_kvm_nested_mmu(struct kvm_vcpu *vcpu) | |||
3386 | struct kvm_mmu *g_context = &vcpu->arch.nested_mmu; | 3388 | struct kvm_mmu *g_context = &vcpu->arch.nested_mmu; |
3387 | 3389 | ||
3388 | g_context->get_cr3 = get_cr3; | 3390 | g_context->get_cr3 = get_cr3; |
3391 | g_context->get_pdptr = kvm_pdptr_read; | ||
3389 | g_context->inject_page_fault = kvm_inject_page_fault; | 3392 | g_context->inject_page_fault = kvm_inject_page_fault; |
3390 | 3393 | ||
3391 | /* | 3394 | /* |