proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-15 13:51:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

virtio-blk: Fix restart after read error

Browse Source 
Current code assumes that only write requests are ever going to be restarted.
This is wrong since rerror=stop exists. Instead of directly starting writes,
use the same request processing as used for new requests.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Kevin Wolf 2010-01-27 13:12:35 +01:00 committed by Anthony Liguori
parent bc6694d43a
commit f1b5286803
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/virtio-blk.c
View File

@ -384,6 +384,10 @@ static void virtio_blk_dma_restart_bh(void *opaque)
{ {
VirtIOBlock *s = opaque; VirtIOBlock *s = opaque;
VirtIOBlockReq *req = s->rq; VirtIOBlockReq *req = s->rq;
MultiReqBuffer mrb = {
.num_writes = 0,
.old_bs = NULL,
};
qemu_bh_delete(s->bh); qemu_bh_delete(s->bh);
s->bh = NULL; s->bh = NULL;
@ -391,10 +395,13 @@ static void virtio_blk_dma_restart_bh(void *opaque)
s->rq = NULL; s->rq = NULL;
while (req) { while (req) {
bdrv_aio_writev(req->dev->bs, req->out->sector, &req->qiov, virtio_blk_handle_request(req, &mrb);
req->qiov.size / 512, virtio_blk_rw_complete, req);
req = req->next; req = req->next;
} }
if (mrb.num_writes > 0) {
do_multiwrite(mrb.old_bs, mrb.blkreq, mrb.num_writes);
}
} }
static void virtio_blk_dma_restart_cb(void *opaque, int running, int reason) static void virtio_blk_dma_restart_cb(void *opaque, int running, int reason)