[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] s390x: refactor error handling for MSCH handler
From: |
Halil Pasic |
Subject: |
[Qemu-devel] [PATCH 8/9] s390x: refactor error handling for MSCH handler |
Date: |
Wed, 30 Aug 2017 18:36:08 +0200 |
Simplify the error handling of the MSCH handler avoiding arbitrary and
cryptic error codes being mapped to what a subchannel is supposed to do.
Let the code detecting the condition tell how it's to be handled in a
less ambiguous way.
Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Pierre Morel<address@hidden>
---
hw/s390x/css.c | 20 +++++++-------------
include/hw/s390x/css.h | 2 +-
target/s390x/ioinst.c | 27 +++++++++------------------
3 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index eff1b91a8c..931a097d6a 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -1182,28 +1182,27 @@ static void copy_schib_from_guest(SCHIB *dest, const
SCHIB *src)
}
}
-int css_do_msch(SubchDev *sch, const SCHIB *orig_schib)
+void css_do_msch(SubchDev *sch, const SCHIB *orig_schib)
{
SCSW *s = &sch->curr_status.scsw;
PMCW *p = &sch->curr_status.pmcw;
uint16_t oldflags;
- int ret;
SCHIB schib;
if (!(sch->curr_status.pmcw.flags & PMCW_FLAGS_MASK_DNV)) {
- ret = 0;
- goto out;
+ sch->iret.cc = 0;
+ return;
}
if (s->ctrl & SCSW_STCTL_STATUS_PEND) {
- ret = -EINPROGRESS;
- goto out;
+ sch->iret.cc = 1;
+ return;
}
if (s->ctrl &
(SCSW_FCTL_START_FUNC|SCSW_FCTL_HALT_FUNC|SCSW_FCTL_CLEAR_FUNC)) {
- ret = -EBUSY;
- goto out;
+ sch->iret.cc = 2;
+ return;
}
copy_schib_from_guest(&schib, orig_schib);
@@ -1230,11 +1229,6 @@ int css_do_msch(SubchDev *sch, const SCHIB *orig_schib)
&& (p->flags & PMCW_FLAGS_MASK_ENA) == 0) {
sch->disable_cb(sch);
}
-
- ret = 0;
-
-out:
- return ret;
}
void css_do_xsch(SubchDev *sch)
diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h
index d8d949da4f..37ac36b014 100644
--- a/include/hw/s390x/css.h
+++ b/include/hw/s390x/css.h
@@ -203,7 +203,7 @@ bool css_subch_visible(SubchDev *sch);
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);
+void css_do_msch(SubchDev *sch, const SCHIB *schib);
void css_do_xsch(SubchDev *sch);
void css_do_csch(SubchDev *sch);
void css_do_hsch(SubchDev *sch);
diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c
index e91788d586..a286495219 100644
--- a/target/s390x/ioinst.c
+++ b/target/s390x/ioinst.c
@@ -128,8 +128,6 @@ void ioinst_handle_msch(S390CPU *cpu, uint64_t reg1,
uint32_t ipb)
SubchDev *sch;
SCHIB schib;
uint64_t addr;
- int ret = -ENODEV;
- int cc;
CPUS390XState *env = &cpu->env;
uint8_t ar;
@@ -148,24 +146,17 @@ void ioinst_handle_msch(S390CPU *cpu, uint64_t reg1,
uint32_t ipb)
}
trace_ioinst_sch_id("msch", cssid, ssid, schid);
sch = css_find_subch(m, cssid, ssid, schid);
- if (sch && css_subch_visible(sch)) {
- ret = css_do_msch(sch, &schib);
+ if (!sch || !css_subch_visible(sch)) {
+ setcc(cpu, 3);
+ return;
}
- switch (ret) {
- case -ENODEV:
- cc = 3;
- break;
- case -EBUSY:
- cc = 2;
- break;
- case 0:
- cc = 0;
- break;
- default:
- cc = 1;
- break;
+ css_subch_clear_iret(sch);
+ css_do_msch(sch, &schib);
+ if (sch->iret.pgm_chk) {
+ program_interrupt(&cpu->env, sch->iret.irq_code, 4);
+ return;
}
- setcc(cpu, cc);
+ setcc(cpu, sch->iret.cc);
}
static void copy_orb_from_guest(ORB *dest, const ORB *src)
--
2.13.5
- Re: [Qemu-devel] [PATCH 2/9] s390x: fix invalid use of cc 1 for SSCH, (continued)
- [Qemu-devel] [PATCH 3/9] s390x/css: be more consistent if broken beyond repair, Halil Pasic, 2017/08/30
- [Qemu-devel] [PATCH 6/9] s390x: refactor error handling for CSCH handler, Halil Pasic, 2017/08/30
- [Qemu-devel] [PATCH 4/9] s390x: refactor error handling for SSCH and RSCH, Halil Pasic, 2017/08/30
- [Qemu-devel] [PATCH 5/9] s390x: refactor error handling for XSCH handler, Halil Pasic, 2017/08/30
- [Qemu-devel] [PATCH 7/9] s390x: refactor error handling for HSCH handler, Halil Pasic, 2017/08/30
- [Qemu-devel] [PATCH 8/9] s390x: refactor error handling for MSCH handler,
Halil Pasic <=
- [Qemu-devel] [PATCH 9/9] s390x: factor out common ioinst handler logic, Halil Pasic, 2017/08/30
- Re: [Qemu-devel] [PATCH 0/9], Cornelia Huck, 2017/08/31