Commit b8a75b60 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging 



# By Cornelia Huck
# Via Cornelia Huck
* cohuck/virtio-ccw-upstr:
  virtio-ccw: Fix unsetting of indicators.
  s390x/css: Fix concurrent sense.

Message-id: 1370592676-22532-1-git-send-email-cornelia.huck@de.ibm.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 8819c10b d1db1fa8

hw/s390x/css.c

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ int css_do_tsch(SubchDev *sch, IRB *target_irb) 
            (p->chars & PMCW_CHARS_MASK_CSENSE)) {

            irb.scsw.flags |= SCSW_FLAGS_MASK_ESWF | SCSW_FLAGS_MASK_ECTL;

            memcpy(irb.ecw, sch->sense_data, sizeof(sch->sense_data));

            irb.esw[1] = 0x02000000 | (sizeof(sch->sense_data) << 8);

            irb.esw[1] = 0x01000000 | (sizeof(sch->sense_data) << 8);

        }

    }

    /* Store the irb to the guest. */

hw/s390x/virtio-ccw.c

+4 −4
Original line number Diff line number Diff line
@@ -328,10 +328,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) 
            ret = -EINVAL;

            break;

        }

        indicators = ldq_phys(ccw.cda);

        if (!indicators) {

        if (!ccw.cda) {

            ret = -EFAULT;

        } else {

            indicators = ldq_phys(ccw.cda);

            dev->indicators = indicators;

            sch->curr_status.scsw.count = ccw.count - sizeof(indicators);

            ret = 0;
@@ -348,10 +348,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) 
            ret = -EINVAL;

            break;

        }

        indicators = ldq_phys(ccw.cda);

        if (!indicators) {

        if (!ccw.cda) {

            ret = -EFAULT;

        } else {

            indicators = ldq_phys(ccw.cda);

            dev->indicators2 = indicators;

            sch->curr_status.scsw.count = ccw.count - sizeof(indicators);

            ret = 0;