[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] scsi-disk: Implement werror for flushes
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 04/10] scsi-disk: Implement werror for flushes |
Date: |
Thu, 4 Nov 2010 14:15:33 +0100 |
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
hw/scsi-disk.c | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 96acfe3..6815239 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -45,6 +45,7 @@ do { fprintf(stderr, "scsi-disk: " fmt , ## __VA_ARGS__); }
while (0)
#define SCSI_REQ_STATUS_RETRY_TYPE_MASK 0x06
#define SCSI_REQ_STATUS_RETRY_READ 0x00
#define SCSI_REQ_STATUS_RETRY_WRITE 0x02
+#define SCSI_REQ_STATUS_RETRY_FLUSH 0x04
typedef struct SCSIDiskState SCSIDiskState;
@@ -74,6 +75,7 @@ struct SCSIDiskState
};
static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type);
+static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf);
static SCSIDiskReq *scsi_new_request(SCSIDiskState *s, uint32_t tag,
uint32_t lun)
@@ -316,6 +318,8 @@ static void scsi_dma_restart_bh(void *opaque)
r = DO_UPCAST(SCSIDiskReq, req, req);
if (r->status & SCSI_REQ_STATUS_RETRY) {
int status = r->status;
+ int ret;
+
r->status &=
~(SCSI_REQ_STATUS_RETRY | SCSI_REQ_STATUS_RETRY_TYPE_MASK);
@@ -326,6 +330,11 @@ static void scsi_dma_restart_bh(void *opaque)
case SCSI_REQ_STATUS_RETRY_WRITE:
scsi_write_request(r);
break;
+ case SCSI_REQ_STATUS_RETRY_FLUSH:
+ ret = scsi_disk_emulate_command(r, r->iov.iov_base);
+ if (ret == 0) {
+ scsi_command_complete(r, GOOD, NO_SENSE);
+ }
}
}
}
@@ -790,6 +799,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r,
uint8_t *outbuf)
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
uint64_t nb_sectors;
int buflen = 0;
+ int ret;
switch (req->cmd.buf[0]) {
case TEST_UNIT_READY:
@@ -880,7 +890,12 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r,
uint8_t *outbuf)
buflen = 8;
break;
case SYNCHRONIZE_CACHE:
- bdrv_flush(s->bs);
+ ret = bdrv_flush(s->bs);
+ if (ret < 0) {
+ if (scsi_handle_rw_error(r, -ret, SCSI_REQ_STATUS_RETRY_FLUSH)) {
+ return -1;
+ }
+ }
break;
case GET_CONFIGURATION:
memset(outbuf, 0, 8);
--
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 <=
- [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, 2010/11/04
- [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