If vmcs12 doesn't specify the "use MSR bitmaps" VM-execution control, then vmcs02 should not specify this control either. When the MSR bitmaps are not used, all executions of RDMSR and WRMSR cause VM-exits. Signed-off-by: Jim Mattson <jmattson@xxxxxxxxxx> --- arch/x86/kvm/vmx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index aafcc9881e88..03879551124a 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -11117,6 +11117,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, vmx->host_rsp = 0; exec_control = vmx_exec_control(vmx); /* L0's desires */ + exec_control &= ~CPU_BASED_USE_MSR_BITMAPS; exec_control &= ~CPU_BASED_VIRTUAL_INTR_PENDING; exec_control &= ~CPU_BASED_VIRTUAL_NMI_PENDING; exec_control &= ~CPU_BASED_TPR_SHADOW; -- 2.17.0.441.gb46fe60e1d-goog
