Message ID | 20170918160012.4317-11-david@redhat.com |
---|---|
State | New |
Headers | show |
Series | s390x: SMP for TCG (+ cleanups) | expand |
On 18.09.2017 17:59, David Hildenbrand wrote: > No need to pass kvm_run. > > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > target/s390x/kvm.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c > index 14f864697d..da3f7e9895 100644 > --- a/target/s390x/kvm.c > +++ b/target/s390x/kvm.c > @@ -1852,7 +1852,7 @@ static int sigp_set_architecture(S390CPU *cpu, uint32_t param, > return SIGP_CC_STATUS_STORED; > } > > -static int handle_sigp(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1) > +static int handle_sigp(S390CPU *cpu, uint32_t ipb, uint8_t ipa1) Maybe order the parameters alphabetically now? I.e. first ipa, then ipb? Anyway, feel free to add my: Reviewed-by: Thomas Huth <thuth@redhat.com>
On 09/18/2017 08:59 AM, David Hildenbrand wrote: > No need to pass kvm_run. > > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > target/s390x/kvm.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 14f864697d..da3f7e9895 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -1852,7 +1852,7 @@ static int sigp_set_architecture(S390CPU *cpu, uint32_t param, return SIGP_CC_STATUS_STORED; } -static int handle_sigp(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1) +static int handle_sigp(S390CPU *cpu, uint32_t ipb, uint8_t ipa1) { CPUS390XState *env = &cpu->env; const uint8_t r1 = ipa1 >> 4; @@ -1866,7 +1866,7 @@ static int handle_sigp(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1) cpu_synchronize_state(CPU(cpu)); /* get order code */ - order = decode_basedisp_rs(env, run->s390_sieic.ipb, NULL) + order = decode_basedisp_rs(env, ipb, NULL) & SIGP_ORDER_MASK; status_reg = &env->regs[r1]; param = (r1 % 2) ? env->regs[r1] : env->regs[r1 + 1]; @@ -1924,7 +1924,7 @@ static int handle_instruction(S390CPU *cpu, struct kvm_run *run) r = handle_diag(cpu, run, run->s390_sieic.ipb); break; case IPA0_SIGP: - r = handle_sigp(cpu, run, ipa1); + r = handle_sigp(cpu, run->s390_sieic.ipb, ipa1); break; }
No need to pass kvm_run. Signed-off-by: David Hildenbrand <david@redhat.com> --- target/s390x/kvm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)