From: Jan Kiszka Date: Wed, 23 Oct 2013 16:43:09 +0000 (+0100) Subject: nVMX: Report CPU_BASED_VIRTUAL_NMI_PENDING as supported X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a294c9bbd0dd0dea415a0ee5b8ee9c07f65f5496;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git nVMX: Report CPU_BASED_VIRTUAL_NMI_PENDING as supported If the host supports it, we can and should expose it to the guest as well, just like we already do with PIN_BASED_VIRTUAL_NMIS. Signed-off-by: Jan Kiszka Signed-off-by: Paolo Bonzini --- diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 81ce3898b448..6850b0f1d52b 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2228,7 +2228,8 @@ static __init void nested_vmx_setup_ctls_msrs(void) nested_vmx_procbased_ctls_low, nested_vmx_procbased_ctls_high); nested_vmx_procbased_ctls_low = 0; nested_vmx_procbased_ctls_high &= - CPU_BASED_VIRTUAL_INTR_PENDING | CPU_BASED_USE_TSC_OFFSETING | + CPU_BASED_VIRTUAL_INTR_PENDING | + CPU_BASED_VIRTUAL_NMI_PENDING | CPU_BASED_USE_TSC_OFFSETING | CPU_BASED_HLT_EXITING | CPU_BASED_INVLPG_EXITING | CPU_BASED_MWAIT_EXITING | CPU_BASED_CR3_LOAD_EXITING | CPU_BASED_CR3_STORE_EXITING |