Consider werror/rerror on immediate bdrv_aio_* failure
cover Consider werror/rerror on immediate bdrv_aio_* failure
There are still paths where werror/rerror is ignored and an error is directly communicated to the guest. This series fixes some of them.
Kevin Wolf (3):
ide: Handle immediate bdrv_aio_flush failure
virtio-blk: Handle immediate flush failure properly
scsi-disk: Fix immediate failure of bdrv_aio_*
hw/ide/core.c | 12 +++++++++--- hw/scsi-disk.c | 11 ++++++----- hw/virtio-blk.c | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-)
Signature · 1 line
1.7.2.3
PATCH 1/3 ide: Handle immediate bdrv_aio_flush failure
If bdrv_aio_flush returns NULL, this should be treated as an error.
--- hw/ide/core.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)
hw/ide/core.c +9 -3
@@ -811,10 +811,16 @@ static void ide_flush_cb(void *opaque, int ret)static void ide_flush_cache (IDEState *s) { -if (s->bs) { -bdrv_aio_flush (s->bs, ide_flush_cb, s); - }else { +BlockDriverAIOCB *acb; + +if (s->bs ==NULL ) {ide_flush_cb (s,0 ); +return ; + } + + acb =bdrv_aio_flush (s->bs, ide_flush_cb, s); +if (acb ==NULL ) { +ide_flush_cb (s, -EIO ); } }
Signature · 1 line
1.7.2.3
PATCH 2/3 virtio-blk: Handle immediate flush failure properly
In reply to Kevin WolfFix virtio-blk to use the usual completion path that involves werror handling instead of directly completing the request in cases where bdrv_aio_flush returns NULL.
--- hw/virtio-blk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
hw/virtio-blk.c +1 -1
@@ -273,7 +273,7 @@ static void virtio_blk_handle_flush(VirtIOBlockReq *req, MultiReqBuffer *mrb) acb =bdrv_aio_flush (req->dev->bs, virtio_blk_flush_complete, req);if (!acb) { -virtio_blk_req_complete (req,VIRTIO_BLK_S_IOERR ); +virtio_blk_flush_complete (req, -EIO ); } }
Signature · 1 line
1.7.2.3
PATCH 3/3 scsi-disk: Fix immediate failure of bdrv_aio_*
In reply to Kevin WolfFix 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.
--- hw/scsi-disk.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
hw/scsi-disk.c +6 -5
@@ -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. */
@@ -274,9 +275,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 );
Signature · 1 line
1.7.2.3