Commit 6c864622 authored by Halil Pasic's avatar Halil Pasic Committed by Cornelia Huck
Browse files

s390x/css: fix cc handling for XSCH 



The function ioinst_handle_xsch is presenting cc 2 when it's supposed to
present cc 1 and the other way around, because css_do_xsch has the error
codes mixed up. Because cc 1 has precedence over cc 2 we also have to
swap the two checks.

Let us fix this.

Signed-off-by: default avatarHalil Pasic <pasic@linux.vnet.ibm.com>
Reported-by: default avatarPierre Morel <pmorel@linux.vnet.ibm.com>
Message-Id: <20170831121828.85885-1-pasic@linux.vnet.ibm.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 7ec6a364

hw/s390x/css.c

+5 −5
Original line number Diff line number Diff line
@@ -1276,16 +1276,16 @@ int css_do_xsch(SubchDev *sch) 
        goto out;

    }



    if (s->ctrl & SCSW_CTRL_MASK_STCTL) {

        ret = -EINPROGRESS;

        goto out;

    }



    if (!(s->ctrl & SCSW_CTRL_MASK_FCTL) ||

        ((s->ctrl & SCSW_CTRL_MASK_FCTL) != SCSW_FCTL_START_FUNC) ||

        (!(s->ctrl &

           (SCSW_ACTL_RESUME_PEND | SCSW_ACTL_START_PEND | SCSW_ACTL_SUSP))) ||

        (s->ctrl & SCSW_ACTL_SUBCH_ACTIVE)) {

        ret = -EINPROGRESS;

        goto out;

    }



    if (s->ctrl & SCSW_CTRL_MASK_STCTL) {

        ret = -EBUSY;

        goto out;

    }