| Message ID | 20191129091713.4582-1-frankja@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v5] s390x: kvm: Make kvm_sclp_service_call void | expand |
On 29.11.19 10:17, Janosch Frank wrote: > It defaults to returning 0 anyway and that return value is not > necessary, as 0 is also the default rc that the caller would return. > > While doing that we can simplify the logic a bit and return early if > we inject a PGM exception. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > --- > target/s390x/kvm.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c > index 0c9d14b4b1..ad6e38c876 100644 > --- a/target/s390x/kvm.c > +++ b/target/s390x/kvm.c > @@ -1159,13 +1159,13 @@ void kvm_s390_access_exception(S390CPU *cpu, uint16_t code, uint64_t te_code) > kvm_s390_vcpu_interrupt(cpu, &irq); > } > > -static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, > +static void kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, > uint16_t ipbh0) > { > CPUS390XState *env = &cpu->env; > uint64_t sccb; > uint32_t code; > - int r = 0; > + int r; > > sccb = env->regs[ipbh0 & 0xf]; > code = env->regs[(ipbh0 & 0xf0) >> 4]; > @@ -1173,11 +1173,9 @@ static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, > r = sclp_service_call(env, sccb, code); > if (r < 0) { > kvm_s390_program_interrupt(cpu, -r); > - } else { > - setcc(cpu, r); > + return; > } > - > - return 0; > + setcc(cpu, r); > } > > static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1) > @@ -1240,7 +1238,7 @@ static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1) > setcc(cpu, 3); > break; > case PRIV_B2_SCLP_CALL: > - rc = kvm_sclp_service_call(cpu, run, ipbh0); > + kvm_sclp_service_call(cpu, run, ipbh0); > break; > default: > rc = -1; > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 0c9d14b4b1..ad6e38c876 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -1159,13 +1159,13 @@ void kvm_s390_access_exception(S390CPU *cpu, uint16_t code, uint64_t te_code) kvm_s390_vcpu_interrupt(cpu, &irq); } -static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, +static void kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, uint16_t ipbh0) { CPUS390XState *env = &cpu->env; uint64_t sccb; uint32_t code; - int r = 0; + int r; sccb = env->regs[ipbh0 & 0xf]; code = env->regs[(ipbh0 & 0xf0) >> 4]; @@ -1173,11 +1173,9 @@ static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, r = sclp_service_call(env, sccb, code); if (r < 0) { kvm_s390_program_interrupt(cpu, -r); - } else { - setcc(cpu, r); + return; } - - return 0; + setcc(cpu, r); } static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1) @@ -1240,7 +1238,7 @@ static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1) setcc(cpu, 3); break; case PRIV_B2_SCLP_CALL: - rc = kvm_sclp_service_call(cpu, run, ipbh0); + kvm_sclp_service_call(cpu, run, ipbh0); break; default: rc = -1;