Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57435349 authored by Jan Kiszka's avatar Jan Kiszka Committed by Paolo Bonzini
Browse files

KVM: nVMX: Fix up VM_ENTRY_IA32E_MODE control feature reporting 



Do not report that we can enter the guest in 64-bit mode if the host is
32-bit only. This is not supported by KVM.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ca72d970

arch/x86/kvm/vmx.c

+5 −1
Original line number Diff line number Diff line
@@ -2212,9 +2212,13 @@ static __init void nested_vmx_setup_ctls_msrs(void) 
	/* If bit 55 of VMX_BASIC is off, bits 0-8 and 12 must be 1. */

	nested_vmx_entry_ctls_low = VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;

	nested_vmx_entry_ctls_high &=

		VM_ENTRY_LOAD_IA32_PAT | VM_ENTRY_IA32E_MODE;

#ifdef CONFIG_X86_64

		VM_ENTRY_IA32E_MODE |

#endif

		VM_ENTRY_LOAD_IA32_PAT;

	nested_vmx_entry_ctls_high |= (VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR |

				       VM_ENTRY_LOAD_IA32_EFER);



	/* cpu-based controls */

	rdmsr(MSR_IA32_VMX_PROCBASED_CTLS,

		nested_vmx_procbased_ctls_low, nested_vmx_procbased_ctls_high);