Re: [PATCH 2/2] KVM: nVMX: VM_ENTRY/EXIT_LOAD_IA32_EFER overrides EFER.LMA settings

[Paolo Bonzini <pbonzini@redhat.com>]

Il 14/04/2013 12:44, Jan Kiszka ha scritto:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> If we load the complete EFER MSR on entry or exit, EFER.LMA (and LME)
> loading is skipped. Their consistency is already checked now before
> starting the transition.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  arch/x86/kvm/vmx.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 0d13b29..1df3b6f 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -7135,7 +7135,7 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
>  
>  	if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_EFER)
>  		vcpu->arch.efer = vmcs12->guest_ia32_efer;
> -	if (vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE)
> +	else if (vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE)
>  		vcpu->arch.efer |= (EFER_LMA | EFER_LME);
>  	else
>  		vcpu->arch.efer &= ~(EFER_LMA | EFER_LME);
> @@ -7536,7 +7536,7 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
>  {
>  	if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_EFER)
>  		vcpu->arch.efer = vmcs12->host_ia32_efer;
> -	if (vmcs12->vm_exit_controls & VM_EXIT_HOST_ADDR_SPACE_SIZE)
> +	else if (vmcs12->vm_exit_controls & VM_EXIT_HOST_ADDR_SPACE_SIZE)
>  		vcpu->arch.efer |= (EFER_LMA | EFER_LME);
>  	else
>  		vcpu->arch.efer &= ~(EFER_LMA | EFER_LME);
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>