diff options
| -rw-r--r-- | target-s390x/ioinst.c | 8 | ||||
| -rw-r--r-- | target-s390x/ioinst.h | 2 | ||||
| -rw-r--r-- | target-s390x/kvm.c | 9 |
3 files changed, 7 insertions, 12 deletions
diff --git a/target-s390x/ioinst.c b/target-s390x/ioinst.c index 23c2fafb65..8052886276 100644 --- a/target-s390x/ioinst.c +++ b/target-s390x/ioinst.c @@ -336,13 +336,13 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb) setcc(cpu, cc); } -int ioinst_handle_tsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) +int ioinst_handle_tsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb) { + CPUS390XState *env = &cpu->env; int cssid, ssid, schid, m; SubchDev *sch; IRB *irb; uint64_t addr; - int ret = -ENODEV; int cc; hwaddr len = sizeof(*irb); @@ -364,12 +364,12 @@ int ioinst_handle_tsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) } sch = css_find_subch(m, cssid, ssid, schid); if (sch && css_subch_visible(sch)) { - ret = css_do_tsch(sch, irb); + cc = css_do_tsch(sch, irb); /* 0 - status pending, 1 - not status pending */ - cc = ret; } else { cc = 3; } + setcc(cpu, cc); out: s390_cpu_physical_memory_unmap(env, irb, sizeof(*irb), 1); return cc; diff --git a/target-s390x/ioinst.h b/target-s390x/ioinst.h index 1efe16c3ae..674616046d 100644 --- a/target-s390x/ioinst.h +++ b/target-s390x/ioinst.h @@ -234,7 +234,7 @@ void ioinst_handle_msch(S390CPU *cpu, uint64_t reg1, uint32_t ipb); void ioinst_handle_ssch(S390CPU *cpu, uint64_t reg1, uint32_t ipb); void ioinst_handle_stcrw(S390CPU *cpu, uint32_t ipb); void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb); -int ioinst_handle_tsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb); +int ioinst_handle_tsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb); void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb); int ioinst_handle_tpi(CPUS390XState *env, uint32_t ipb); void ioinst_handle_schm(S390CPU *cpu, uint64_t reg1, uint64_t reg2, diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index f65a1d26a5..d7c57d9338 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -1338,19 +1338,14 @@ static int handle_intercept(S390CPU *cpu) static int handle_tsch(S390CPU *cpu) { - CPUS390XState *env = &cpu->env; CPUState *cs = CPU(cpu); struct kvm_run *run = cs->kvm_run; int ret; cpu_synchronize_state(cs); - ret = ioinst_handle_tsch(env, env->regs[1], run->s390_tsch.ipb); - if (ret >= 0) { - /* Success; set condition code. */ - setcc(cpu, ret); - ret = 0; - } else if (ret < -1) { + ret = ioinst_handle_tsch(cpu, cpu->env.regs[1], run->s390_tsch.ipb); + if (ret < 0) { /* * Failure. * If an I/O interrupt had been dequeued, we have to reinject it. |