ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Cornelia Huck 2013-04-26 02:12:54 +00:00 committed by Alexander Graf
parent 776e7f0f21
commit 0f3f1f302f
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pc-bios/s390-ccw/virtio.c
View File

@ -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, * assume that a simple tsch will have finished the CCW processing,
* but the architecture allows for asynchronous operation * but the architecture allows for asynchronous operation
*/ */
drain_irqs(schid); if (!r) {
r = drain_irqs(schid);
}
return r; return r;
} }
@ -92,7 +94,9 @@ static void virtio_set_status(struct subchannel_id schid,
unsigned long dev_addr) unsigned long dev_addr)
{ {
unsigned char status = 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) 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; struct virtio_blk_outhdr out_hdr;
u8 status; u8 status;
int r;
/* Tell the host we want to read */ /* Tell the host we want to read */
out_hdr.type = VIRTIO_BLK_T_IN; 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 */ /* Now we can tell the host to read */
vring_wait_reply(&block, 0); 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; return status;
} }
@ -262,9 +270,10 @@ void virtio_setup_block(struct subchannel_id schid)
info.num = 128; info.num = 128;
block.schid = schid; block.schid = schid;
run_ccw(schid, CCW_CMD_SET_VQ, &info, sizeof(info)); if (!run_ccw(schid, CCW_CMD_SET_VQ, &info, sizeof(info))) {
virtio_set_status(schid, VIRTIO_CONFIG_S_DRIVER_OK); virtio_set_status(schid, VIRTIO_CONFIG_S_DRIVER_OK);
} }
}
bool virtio_is_blk(struct subchannel_id schid) bool virtio_is_blk(struct subchannel_id schid)
{ {