sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

scsi-disk: Fix immediate failure of bdrv_aio_* 

Fix scsi-disk to use the usual completion paths that involve rerror/werror
handling instead of directly completing the requests in cases where
bdrv_aio_readv/writev returns NULL.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2010-10-27 13:15:27 +02:00
parent 18a8d4214b
commit d33ea50a95
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/scsi-disk.c
View File

@ -178,8 +178,9 @@ static void scsi_read_request(SCSIDiskReq *r)
qemu_iovec_init_external(&r->qiov, &r->iov, 1);
r->req.aiocb = bdrv_aio_readv(s->bs, r->sector, &r->qiov, n,
scsi_read_complete, r);
if (r->req.aiocb == NULL)
scsi_command_complete(r, CHECK_CONDITION, HARDWARE_ERROR);
if (r->req.aiocb == NULL) {
scsi_read_complete(r, -EIO);
}
}
/* Read more data from scsi device into buffer. */
@ -273,9 +274,9 @@ static void scsi_write_request(SCSIDiskReq *r)
qemu_iovec_init_external(&r->qiov, &r->iov, 1);
r->req.aiocb = bdrv_aio_writev(s->bs, r->sector, &r->qiov, n,
scsi_write_complete, r);
if (r->req.aiocb == NULL)
scsi_command_complete(r, CHECK_CONDITION,
HARDWARE_ERROR);
if (r->req.aiocb == NULL) {
scsi_write_complete(r, -EIO);
}
} else {
/* Invoke completion routine to fetch data from host. */
scsi_write_complete(r, 0);