From 6c510fbf601fd8c6891b2f1d7165ceb82308a16f Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Wed, 27 Jan 2010 13:12:36 +0100 Subject: [PATCH] virtio-blk: Fix error cases which ignored rerror/werror If an I/O request fails right away instead of getting an error only in the callback, we still need to consider rerror/werror. Signed-off-by: Kevin Wolf Signed-off-by: Anthony Liguori --- hw/virtio-blk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 5a413b9..037a79c 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -269,7 +269,7 @@ static void do_multiwrite(BlockDriverState *bs, BlockRequest *blkreq, if (ret != 0) { for (i = 0; i < num_writes; i++) { if (blkreq[i].error) { - virtio_blk_req_complete(blkreq[i].opaque, VIRTIO_BLK_S_IOERR); + virtio_blk_rw_complete(blkreq[i].opaque, -EIO); } } } @@ -313,7 +313,7 @@ static void virtio_blk_handle_read(VirtIOBlockReq *req) acb = bdrv_aio_readv(req->dev->bs, req->out->sector, &req->qiov, req->qiov.size / 512, virtio_blk_rw_complete, req); if (!acb) { - virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR); + virtio_blk_rw_complete(req, -EIO); } } -- 2.7.4