From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44835) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLxHo-0003s2-JD for qemu-devel@nongnu.org; Thu, 12 Feb 2015 12:10:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLxHf-0008Gs-Cs for qemu-devel@nongnu.org; Thu, 12 Feb 2015 12:10:44 -0500 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:42067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLxHe-0008GG-TM for qemu-devel@nongnu.org; Thu, 12 Feb 2015 12:10:35 -0500 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 12 Feb 2015 17:10:34 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 4E0B317D8073 for ; Thu, 12 Feb 2015 17:10:43 +0000 (GMT) Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t1CH9lcm7274950 for ; Thu, 12 Feb 2015 17:09:47 GMT Received: from d06av07.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t1CH9kiN028455 for ; Thu, 12 Feb 2015 12:09:46 -0500 From: Jens Freimann Date: Thu, 12 Feb 2015 18:09:36 +0100 Message-Id: <1423760982-8474-20-git-send-email-jfrei@linux.vnet.ibm.com> In-Reply-To: <1423760982-8474-1-git-send-email-jfrei@linux.vnet.ibm.com> References: <1423760982-8474-1-git-send-email-jfrei@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 19/25] s390x/ioinst: Set condition code in ioinst_handle_tsch() handler List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christian Borntraeger , Alexander Graf , Cornelia Huck Cc: Jens Freimann , qemu-devel@nongnu.org, Thomas Huth From: Thomas Huth Move the setting of the condition code from kvm.c into the handler function in ioinst.c itself, just like it has been done with the other handlers already (TSCH has just not been changed yet since it is called from a different dispatcher in kvm.c). Signed-off-by: Thomas Huth Signed-off-by: Jens Freimann Reviewed-by: Cornelia Huck Reviewed-by: David Hildenbrand --- target-s390x/ioinst.c | 8 ++++---- target-s390x/ioinst.h | 2 +- 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 23c2faf..8052886 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 1efe16c..6746160 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 a9a4c64..195493c 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -1337,19 +1337,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. -- 2.1.4