summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorWanpeng Li <wanpeng.li@hotmail.com>2017-03-12 00:53:52 -0800
committerRadim Krčmář <rkrcmar@redhat.com>2017-03-20 16:25:06 +0100
commit6d1b3ad2cd87150fc89bad2331beab173a8ad24d (patch)
tree8306abf17bab87bb3ac1d69e9dd11ee3e7d254ec /arch/x86
parent49e190ec332e96ba28f24b86f7a92f614707819b (diff)
downloadtalos-op-linux-6d1b3ad2cd87150fc89bad2331beab173a8ad24d.tar.gz
talos-op-linux-6d1b3ad2cd87150fc89bad2331beab173a8ad24d.zip
KVM: nVMX: don't reset kvm mmu twice
kvm mmu is reset once successfully loading CR3 as part of emulating vmentry in nested_vmx_load_cr3(). We should not reset kvm mmu twice. Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Radim Krčmář <rkrcmar@redhat.com> Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/vmx.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index e7ec88961b1a..c66436530a93 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -10287,8 +10287,6 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,
entry_failure_code))
return 1;
- kvm_mmu_reset_context(vcpu);
-
if (!enable_ept)
vcpu->arch.walk_mmu->inject_page_fault = vmx_inject_page_fault_nested;
OpenPOWER on IntegriCloud