diff options
author | Eduardo Habkost <ehabkost@redhat.com> | 2016-06-13 18:57:58 -0300 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2016-06-20 16:38:13 +0200 |
commit | 9be385980d37e8f4fd33f605f5fb1c3d144170a8 (patch) | |
tree | d4516d2305c01fabda776667acdb48c48cb105af /target-i386 | |
parent | 6b62d961373e0327f2af8fb77d6d5d6308864180 (diff) |
coccinelle: Remove unnecessary variables for function return value
Use Coccinelle script to replace 'ret = E; return ret' with
'return E'. The script will do the substitution only when the
function return type and variable type are the same.
Manual fixups:
* audio/audio.c: coding style of "read (...)" and "write (...)"
* block/qcow2-cluster.c: wrap line to make it shorter
* block/qcow2-refcount.c: change indentation of wrapped line
* target-tricore/op_helper.c: fix coding style of
"remainder|quotient"
* target-mips/dsp_helper.c: reverted changes because I don't
want to argue about checkpatch.pl
* ui/qemu-pixman.c: fix line indentation
* block/rbd.c: restore blank line between declarations and
statements
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1465855078-19435-4-git-send-email-ehabkost@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Unused Coccinelle rule name dropped along with a redundant comment;
whitespace touched up in block/qcow2-cluster.c; stale commit message
paragraph deleted]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'target-i386')
-rw-r--r-- | target-i386/fpu_helper.c | 10 | ||||
-rw-r--r-- | target-i386/kvm.c | 5 |
2 files changed, 4 insertions, 11 deletions
diff --git a/target-i386/fpu_helper.c b/target-i386/fpu_helper.c index 206e60fdf5..929489bfc8 100644 --- a/target-i386/fpu_helper.c +++ b/target-i386/fpu_helper.c @@ -298,18 +298,12 @@ int32_t helper_fistt_ST0(CPUX86State *env) int32_t helper_fisttl_ST0(CPUX86State *env) { - int32_t val; - - val = floatx80_to_int32_round_to_zero(ST0, &env->fp_status); - return val; + return floatx80_to_int32_round_to_zero(ST0, &env->fp_status); } int64_t helper_fisttll_ST0(CPUX86State *env) { - int64_t val; - - val = floatx80_to_int64_round_to_zero(ST0, &env->fp_status); - return val; + return floatx80_to_int64_round_to_zero(ST0, &env->fp_status); } void helper_fldt_ST0(CPUX86State *env, target_ulong ptr) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index ff92b1d118..f3698f19b5 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1346,7 +1346,7 @@ static int kvm_put_xsave(X86CPU *cpu) CPUX86State *env = &cpu->env; X86XSaveArea *xsave = env->kvm_xsave_buf; uint16_t cwd, swd, twd; - int i, r; + int i; if (!has_xsave) { return kvm_put_fpu(cpu); @@ -1395,8 +1395,7 @@ static int kvm_put_xsave(X86CPU *cpu) 16 * sizeof env->xmm_regs[16]); memcpy(&xsave->pkru_state, &env->pkru, sizeof env->pkru); #endif - r = kvm_vcpu_ioctl(CPU(cpu), KVM_SET_XSAVE, xsave); - return r; + return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_XSAVE, xsave); } static int kvm_put_xcrs(X86CPU *cpu) |