[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] scsi-disk: Fix immediate failure of bdrv_aio_
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 10/10] scsi-disk: Fix immediate failure of bdrv_aio_* |
Date: |
Thu, 4 Nov 2010 14:15:39 +0100 |
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 <address@hidden>
---
hw/scsi-disk.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 6815239..dc71957 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -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);
--
1.7.2.3
- [Qemu-devel] [PULL 00/10] Block patches, Kevin Wolf, 2010/11/04
- [Qemu-devel] [PATCH 01/10] scsi-disk: Implement rerror option, Kevin Wolf, 2010/11/04
- [Qemu-devel] [PATCH 02/10] block: Allow bdrv_flush to return errors, Kevin Wolf, 2010/11/04
- [Qemu-devel] [PATCH 03/10] scsi-disk: Complete failed requests in scsi_disk_emulate_command, Kevin Wolf, 2010/11/04
- [Qemu-devel] [PATCH 05/10] vpc: Implement bdrv_flush, Kevin Wolf, 2010/11/04
- [Qemu-devel] [PATCH 04/10] scsi-disk: Implement werror for flushes, Kevin Wolf, 2010/11/04
- [Qemu-devel] [PATCH 06/10] qcow2: Invalidate cache after failed read, Kevin Wolf, 2010/11/04
- [Qemu-devel] [PATCH 08/10] ide: Handle immediate bdrv_aio_flush failure, Kevin Wolf, 2010/11/04
- [Qemu-devel] [PATCH 07/10] block: avoid a warning on 64 bit hosts with long as int64_t, Kevin Wolf, 2010/11/04
- [Qemu-devel] [PATCH 10/10] scsi-disk: Fix immediate failure of bdrv_aio_*,
Kevin Wolf <=
- [Qemu-devel] [PATCH 09/10] virtio-blk: Handle immediate flush failure properly, Kevin Wolf, 2010/11/04
- [Qemu-devel] Re: [PULL 00/10] Block patches, Anthony Liguori, 2010/11/04