diff mbox

[RFC,1/2] KVM: remove useless check of "ret" variable prior to returning the same value

Message ID 20150328222717.GA6508@gnote (mailing list archive)
State New, archived
Headers show

Commit Message

Eugene Korenevsky March 28, 2015, 10:27 p.m. UTC
A trivial code cleanup. This `if` is redundant. 

Signed-off-by: Eugene Korenevsky <ekorenevsky@gmail.com>
---
 arch/x86/kvm/emulate.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Paolo Bonzini March 30, 2015, 2:57 p.m. UTC | #1
On 28/03/2015 23:27, Eugene Korenevsky wrote:
> A trivial code cleanup. This `if` is redundant. 
> 
> Signed-off-by: Eugene Korenevsky <ekorenevsky@gmail.com>
> ---
>  arch/x86/kvm/emulate.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
> index 106c015..3a494f3 100644
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@ -2782,10 +2782,8 @@ static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt,
>  		return ret;
>  	ret = __load_segment_descriptor(ctxt, tss->gs, VCPU_SREG_GS, cpl,
>  					X86_TRANSFER_TASK_SWITCH, NULL);
> -	if (ret != X86EMUL_CONTINUE)
> -		return ret;
>  
> -	return X86EMUL_CONTINUE;
> +	return ret;
>  }
>  
>  static int task_switch_32(struct x86_emulate_ctxt *ctxt,
> 

Applied this one for now.

Paolo
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 106c015..3a494f3 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2782,10 +2782,8 @@  static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt,
 		return ret;
 	ret = __load_segment_descriptor(ctxt, tss->gs, VCPU_SREG_GS, cpl,
 					X86_TRANSFER_TASK_SWITCH, NULL);
-	if (ret != X86EMUL_CONTINUE)
-		return ret;
 
-	return X86EMUL_CONTINUE;
+	return ret;
 }
 
 static int task_switch_32(struct x86_emulate_ctxt *ctxt,