mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x: kvm: Make kvm_sclp_service_call void

Browse Source 
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>
Message-Id: <20191129091713.4582-1-frankja@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Janosch Frank 2019-11-29 04:17:13 -05:00 committed by Cornelia Huck
parent 0b7fd817e0
commit 15b6c0370c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/s390x/kvm.c
View File

@ -1159,13 +1159,13 @@ void kvm_s390_access_exception(S390CPU *cpu, uint16_t code, uint64_t te_code)
kvm_s390_vcpu_interrupt(cpu, &irq); 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) uint16_t ipbh0)
{ {
CPUS390XState *env = &cpu->env; CPUS390XState *env = &cpu->env;
uint64_t sccb; uint64_t sccb;
uint32_t code; uint32_t code;
int r = 0; int r;
sccb = env->regs[ipbh0 & 0xf]; sccb = env->regs[ipbh0 & 0xf];
code = env->regs[(ipbh0 & 0xf0) >> 4]; 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); r = sclp_service_call(env, sccb, code);
if (r < 0) { if (r < 0) {
kvm_s390_program_interrupt(cpu, -r); kvm_s390_program_interrupt(cpu, -r);
} else { return;
setcc(cpu, r);
} }
setcc(cpu, r);
return 0;
} }
static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1) 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); setcc(cpu, 3);
break; break;
case PRIV_B2_SCLP_CALL: case PRIV_B2_SCLP_CALL:
rc = kvm_sclp_service_call(cpu, run, ipbh0); kvm_sclp_service_call(cpu, run, ipbh0);
break; break;
default: default:
rc = -1; rc = -1;