summaryrefslogtreecommitdiff
path: root/pc-bios
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2013-04-26 02:12:54 +0000
committerAlexander Graf <agraf@suse.de>2013-04-26 20:18:24 +0200
commit0f3f1f302fd2021a5ce6cb170321d0a0d35bdec5 (patch)
tree83b685a4b806d59e6124de682e718359f7801882 /pc-bios
parent776e7f0f215dd11dde85277723408fae3d319143 (diff)
downloadqemu-0f3f1f302fd2021a5ce6cb170321d0a0d35bdec5.zip
s390-ccw.img: Rudimentary error checking.
Try to handle at least some of the errors that may happen. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/s390-ccw/virtio.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 1bd17d4781..e0cede57f9 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -84,7 +84,9 @@ static int run_ccw(struct subchannel_id schid, int cmd, void *ptr, int len)
* assume that a simple tsch will have finished the CCW processing,
* but the architecture allows for asynchronous operation
*/
- drain_irqs(schid);
+ if (!r) {
+ r = drain_irqs(schid);
+ }
return r;
}
@@ -92,7 +94,9 @@ static void virtio_set_status(struct subchannel_id schid,
unsigned long dev_addr)
{
unsigned char status = dev_addr;
- run_ccw(schid, CCW_CMD_WRITE_STATUS, &status, sizeof(status));
+ if (run_ccw(schid, CCW_CMD_WRITE_STATUS, &status, sizeof(status))) {
+ virtio_panic("Could not write status to host!\n");
+ }
}
static void virtio_reset(struct subchannel_id schid)
@@ -193,6 +197,7 @@ static int virtio_read_many(ulong sector, void *load_addr, int sec_num)
{
struct virtio_blk_outhdr out_hdr;
u8 status;
+ int r;
/* Tell the host we want to read */
out_hdr.type = VIRTIO_BLK_T_IN;
@@ -213,8 +218,11 @@ static int virtio_read_many(ulong sector, void *load_addr, int sec_num)
/* Now we can tell the host to read */
vring_wait_reply(&block, 0);
- drain_irqs(block.schid);
-
+ r = drain_irqs(block.schid);
+ if (r) {
+ /* Well, whatever status is supposed to contain... */
+ status = 1;
+ }
return status;
}
@@ -262,8 +270,9 @@ void virtio_setup_block(struct subchannel_id schid)
info.num = 128;
block.schid = schid;
- run_ccw(schid, CCW_CMD_SET_VQ, &info, sizeof(info));
- virtio_set_status(schid, VIRTIO_CONFIG_S_DRIVER_OK);
+ if (!run_ccw(schid, CCW_CMD_SET_VQ, &info, sizeof(info))) {
+ virtio_set_status(schid, VIRTIO_CONFIG_S_DRIVER_OK);
+ }
}
bool virtio_is_blk(struct subchannel_id schid)