diff options
| author | Pierre Morel <pmorel@linux.vnet.ibm.com> | 2016-09-07 12:58:40 +0200 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2016-09-19 11:05:51 +0200 |
| commit | e32652f7594e6c027737fa495974cb73754cb5d0 (patch) | |
| tree | 47e7d63a7912214897f27a18110937b7e3d5fdfa | |
| parent | 1e4738b2d4141e8045036ff7e03bed4f185649ff (diff) | |
| download | focaccia-qemu-e32652f7594e6c027737fa495974cb73754cb5d0.tar.gz focaccia-qemu-e32652f7594e6c027737fa495974cb73754cb5d0.zip | |
virtio-ccw: respond to READ_STATUS command
This patch adds the response to the READ_STATUS CCW command. Signed-off-by: Pierre Morel <pmorel@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to '')
| -rw-r--r-- | hw/s390x/virtio-ccw.c | 20 | ||||
| -rw-r--r-- | hw/s390x/virtio-ccw.h | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 96789569a7..0a997e17b6 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -455,6 +455,26 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) } } break; + case CCW_CMD_READ_STATUS: + if (check_len) { + if (ccw.count != sizeof(status)) { + ret = -EINVAL; + break; + } + } else if (ccw.count < sizeof(status)) { + /* Can't execute command. */ + ret = -EINVAL; + break; + } + if (!ccw.cda) { + ret = -EFAULT; + } else { + address_space_stb(&address_space_memory, ccw.cda, vdev->status, + MEMTXATTRS_UNSPECIFIED, NULL); + sch->curr_status.scsw.count = ccw.count - sizeof(vdev->status);; + ret = 0; + } + break; case CCW_CMD_WRITE_STATUS: if (check_len) { if (ccw.count != sizeof(status)) { diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index b58ab21d4c..6ef940a98c 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -45,6 +45,7 @@ #define CCW_CMD_SET_IND 0x43 #define CCW_CMD_SET_CONF_IND 0x53 #define CCW_CMD_READ_VQ_CONF 0x32 +#define CCW_CMD_READ_STATUS 0x72 #define CCW_CMD_SET_IND_ADAPTER 0x73 #define CCW_CMD_SET_VIRTIO_REV 0x83 |