[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/8] s390x: refactor error handling for XSCH hand
From: |
Halil Pasic |
Subject: |
[Qemu-devel] [PATCH v2 4/8] s390x: refactor error handling for XSCH handler |
Date: |
Wed, 4 Oct 2017 17:41:40 +0200 |
Simplify the error handling of the XSCH. Let the code detecting the
condition tell (in a less ambiguous way) how it's to be handled. No
changes in behavior.
Signed-off-by: Halil Pasic <address@hidden>
---
hw/s390x/css.c | 17 +++++------------
include/hw/s390x/css.h | 2 +-
target/s390x/ioinst.c | 23 ++++-------------------
3 files changed, 10 insertions(+), 32 deletions(-)
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index b2978c3bae..175624d1c8 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -1223,20 +1223,17 @@ out:
return ret;
}
-int css_do_xsch(SubchDev *sch)
+IOInstEnding css_do_xsch(SubchDev *sch)
{
SCSW *s = &sch->curr_status.scsw;
PMCW *p = &sch->curr_status.pmcw;
- int ret;
if (~(p->flags) & (PMCW_FLAGS_MASK_DNV | PMCW_FLAGS_MASK_ENA)) {
- ret = -ENODEV;
- goto out;
+ return (IOInstEnding){.cc = 3};
}
if (s->ctrl & SCSW_CTRL_MASK_STCTL) {
- ret = -EINPROGRESS;
- goto out;
+ return (IOInstEnding){.cc = 1};
}
if (!(s->ctrl & SCSW_CTRL_MASK_FCTL) ||
@@ -1244,8 +1241,7 @@ int css_do_xsch(SubchDev *sch)
(!(s->ctrl &
(SCSW_ACTL_RESUME_PEND | SCSW_ACTL_START_PEND | SCSW_ACTL_SUSP))) ||
(s->ctrl & SCSW_ACTL_SUBCH_ACTIVE)) {
- ret = -EBUSY;
- goto out;
+ return (IOInstEnding){.cc = 2};
}
/* Cancel the current operation. */
@@ -1257,10 +1253,7 @@ int css_do_xsch(SubchDev *sch)
sch->last_cmd_valid = false;
s->dstat = 0;
s->cstat = 0;
- ret = 0;
-
-out:
- return ret;
+ return (IOInstEnding){.cc = 0};
}
int css_do_csch(SubchDev *sch)
diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h
index 2116c6b3c7..4c89d77893 100644
--- a/include/hw/s390x/css.h
+++ b/include/hw/s390x/css.h
@@ -212,7 +212,7 @@ void css_conditional_io_interrupt(SubchDev *sch);
int css_do_stsch(SubchDev *sch, SCHIB *schib);
bool css_schid_final(int m, uint8_t cssid, uint8_t ssid, uint16_t schid);
int css_do_msch(SubchDev *sch, const SCHIB *schib);
-int css_do_xsch(SubchDev *sch);
+IOInstEnding css_do_xsch(SubchDev *sch);
int css_do_csch(SubchDev *sch);
int css_do_hsch(SubchDev *sch);
IOInstEnding css_do_ssch(SubchDev *sch, ORB *orb);
diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c
index 582287ff6c..85f5be6ca3 100644
--- a/target/s390x/ioinst.c
+++ b/target/s390x/ioinst.c
@@ -42,8 +42,6 @@ void ioinst_handle_xsch(S390CPU *cpu, uint64_t reg1)
{
int cssid, ssid, schid, m;
SubchDev *sch;
- int ret = -ENODEV;
- int cc;
if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) {
program_interrupt(&cpu->env, PGM_OPERAND, 4);
@@ -51,24 +49,11 @@ void ioinst_handle_xsch(S390CPU *cpu, uint64_t reg1)
}
trace_ioinst_sch_id("xsch", cssid, ssid, schid);
sch = css_find_subch(m, cssid, ssid, schid);
- if (sch && css_subch_visible(sch)) {
- ret = css_do_xsch(sch);
- }
- switch (ret) {
- case -ENODEV:
- cc = 3;
- break;
- case -EBUSY:
- cc = 2;
- break;
- case 0:
- cc = 0;
- break;
- default:
- cc = 1;
- break;
+ if (!sch || !css_subch_visible(sch)) {
+ setcc(cpu, 3);
+ return;
}
- setcc(cpu, cc);
+ setcc(cpu, css_do_xsch(sch).cc);
}
void ioinst_handle_csch(S390CPU *cpu, uint64_t reg1)
--
2.13.5
- Re: [Qemu-devel] [PATCH v2 2/8] s390x/css: IO instr handler ending control, (continued)
- Re: [Qemu-devel] [PATCH v2 2/8] s390x/css: IO instr handler ending control, Halil Pasic, 2017/10/10
- Re: [Qemu-devel] [PATCH v2 2/8] s390x/css: IO instr handler ending control, Halil Pasic, 2017/10/10
- Re: [Qemu-devel] [PATCH v2 2/8] s390x/css: IO instr handler ending control, Thomas Huth, 2017/10/12
- Re: [Qemu-devel] [PATCH v2 2/8] s390x/css: IO instr handler ending control, Halil Pasic, 2017/10/12
- Re: [Qemu-devel] [PATCH v2 2/8] s390x/css: IO instr handler ending control, Halil Pasic, 2017/10/17
- Re: [Qemu-devel] [qemu-s390x] [PATCH v2 2/8] s390x/css: IO instr handler ending control, Thomas Huth, 2017/10/17
- Re: [Qemu-devel] [qemu-s390x] [PATCH v2 2/8] s390x/css: IO instr handler ending control, Cornelia Huck, 2017/10/17
- Re: [Qemu-devel] [qemu-s390x] [PATCH v2 2/8] s390x/css: IO instr handler ending control, Halil Pasic, 2017/10/17
- Re: [Qemu-devel] [PATCH v2 2/8] s390x/css: IO instr handler ending control, Cornelia Huck, 2017/10/09
- Re: [Qemu-devel] [PATCH v2 2/8] s390x/css: IO instr handler ending control, Halil Pasic, 2017/10/09
[Qemu-devel] [PATCH v2 4/8] s390x: refactor error handling for XSCH handler,
Halil Pasic <=
[Qemu-devel] [PATCH v2 1/8] s390x/css: be more consistent if broken beyond repair, Halil Pasic, 2017/10/04
[Qemu-devel] [PATCH v2 8/8] s390x: factor out common ioinst handler logic, Halil Pasic, 2017/10/04
[Qemu-devel] [PATCH v2 6/8] s390x: refactor error handling for HSCH handler, Halil Pasic, 2017/10/04
[Qemu-devel] [PATCH v2 7/8] s390x: refactor error handling for MSCH handler, Halil Pasic, 2017/10/04