On Tue, Aug 06, 2013 at 10:39:56AM +0200, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kis...@siemens.com>
>
> 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: Jan Kiszka <jan.kis...@siemens.com>
Reviewed-by: Gleb Natapov <g...@redhat.com>
> ---
> arch/x86/kvm/vmx.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 773b54d..c810f9b 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -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);
> --
> 1.7.3.4
--
Gleb.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
