Re: [PATCH v2 1/2] KVM : Change location of 3 functions in vmx.c

[Gleb Natapov <gleb@redhat.com>]

Please add prefix VMX for vmx patches (or nVMX for nested) on a subject line
in the future. Like this:
KVM: nVMX: Change location of 3 functions in vmx.c.

No need to resend.

Otherwise both patches looks good to me.

On Thu, Jul 04, 2013 at 03:03:32PM +0800, Arthur Chunqi Li wrote:
> Move nested_vmx_succeed/nested_vmx_failInvalid/nested_vmx_failValid
> ahead of handle_vmon to eliminate double declaration in the same
> file
> 
> Signed-off-by: Arthur Chunqi Li <yzt356@gmail.com>
> ---
>  arch/x86/kvm/vmx.c |   83 +++++++++++++++++++++++++---------------------------
>  1 file changed, 40 insertions(+), 43 deletions(-)
> 
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 260a919..1764b13 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -5551,8 +5551,47 @@ static void nested_free_all_saved_vmcss(struct vcpu_vmx *vmx)
>  		free_loaded_vmcs(&vmx->vmcs01);
>  }
>  
> +/*
> + * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
> + * set the success or error code of an emulated VMX instruction, as specified
> + * by Vol 2B, VMX Instruction Reference, "Conventions".
> + */
> +static void nested_vmx_succeed(struct kvm_vcpu *vcpu)
> +{
> +	vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)
> +			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> +			    X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));
> +}
> +
> +static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)
> +{
> +	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> +			& ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |
> +			    X86_EFLAGS_SF | X86_EFLAGS_OF))
> +			| X86_EFLAGS_CF);
> +}
> +
>  static void nested_vmx_failValid(struct kvm_vcpu *vcpu,
> -				 u32 vm_instruction_error);
> +					u32 vm_instruction_error)
> +{
> +	if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {
> +		/*
> +		 * failValid writes the error number to the current VMCS, which
> +		 * can't be done there isn't a current VMCS.
> +		 */
> +		nested_vmx_failInvalid(vcpu);
> +		return;
> +	}
> +	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> +			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> +			    X86_EFLAGS_SF | X86_EFLAGS_OF))
> +			| X86_EFLAGS_ZF);
> +	get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;
> +	/*
> +	 * We don't need to force a shadow sync because
> +	 * VM_INSTRUCTION_ERROR is not shadowed
> +	 */
> +}
>  
>  /*
>   * Emulate the VMXON instruction.
> @@ -5752,48 +5791,6 @@ static int get_vmx_mem_address(struct kvm_vcpu *vcpu,
>  	return 0;
>  }
>  
> -/*
> - * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
> - * set the success or error code of an emulated VMX instruction, as specified
> - * by Vol 2B, VMX Instruction Reference, "Conventions".
> - */
> -static void nested_vmx_succeed(struct kvm_vcpu *vcpu)
> -{
> -	vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)
> -			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> -			    X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));
> -}
> -
> -static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)
> -{
> -	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> -			& ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |
> -			    X86_EFLAGS_SF | X86_EFLAGS_OF))
> -			| X86_EFLAGS_CF);
> -}
> -
> -static void nested_vmx_failValid(struct kvm_vcpu *vcpu,
> -					u32 vm_instruction_error)
> -{
> -	if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {
> -		/*
> -		 * failValid writes the error number to the current VMCS, which
> -		 * can't be done there isn't a current VMCS.
> -		 */
> -		nested_vmx_failInvalid(vcpu);
> -		return;
> -	}
> -	vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
> -			& ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
> -			    X86_EFLAGS_SF | X86_EFLAGS_OF))
> -			| X86_EFLAGS_ZF);
> -	get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;
> -	/*
> -	 * We don't need to force a shadow sync because
> -	 * VM_INSTRUCTION_ERROR is not shadowed
> -	 */
> -}
> -
>  /* Emulate the VMCLEAR instruction */
>  static int handle_vmclear(struct kvm_vcpu *vcpu)
>  {
> -- 
> 1.7.9.5

--
			Gleb.