diff options
| author | Halil Pasic <pasic@linux.vnet.ibm.com> | 2017-10-17 16:04:51 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-10-20 13:32:10 +0200 |
| commit | 773314426e1ca31e0fcfe137755d43d06eedb0bb (patch) | |
| tree | 2bba8655cb5e5205e060a654ceeaccfcea6ff5a9 /hw/s390x/css.c | |
| parent | 963764081d84f25ecc6aff0d49e074c150910e6a (diff) | |
| download | focaccia-qemu-773314426e1ca31e0fcfe137755d43d06eedb0bb.tar.gz focaccia-qemu-773314426e1ca31e0fcfe137755d43d06eedb0bb.zip | |
s390x: refactor error handling for CSCH handler
Simplify the error handling of the CSCH. 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 <pasic@linux.vnet.ibm.com> Message-Id: <20171017140453.51099-6-pasic@linux.vnet.ibm.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw/s390x/css.c')
| -rw-r--r-- | hw/s390x/css.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/hw/s390x/css.c b/hw/s390x/css.c index bee12a3e65..d9d3e4c706 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -1435,26 +1435,20 @@ IOInstEnding css_do_xsch(SubchDev *sch) return IOINST_CC_EXPECTED; } -int css_do_csch(SubchDev *sch) +IOInstEnding css_do_csch(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 IOINST_CC_NOT_OPERATIONAL; } /* Trigger the clear function. */ s->ctrl &= ~(SCSW_CTRL_MASK_FCTL | SCSW_CTRL_MASK_ACTL); s->ctrl |= SCSW_FCTL_CLEAR_FUNC | SCSW_ACTL_CLEAR_PEND; - do_subchannel_work(sch); - ret = 0; - -out: - return ret; + return do_subchannel_work(sch); } int css_do_hsch(SubchDev *sch) |