[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 21/33] scsi-disk: fix retrying a flush
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 21/33] scsi-disk: fix retrying a flush |
Date: |
Tue, 25 Oct 2011 12:40:29 +0200 |
Flush does not go anymore through scsi_disk_emulate_command.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi-disk.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 98881c6..88a65c5 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -81,7 +81,7 @@ struct SCSIDiskState
};
static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type);
-static int scsi_disk_emulate_command(SCSIDiskReq *r);
+static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf);
static void scsi_free_request(SCSIRequest *req)
{
@@ -325,7 +325,6 @@ 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);
@@ -338,10 +337,8 @@ static void scsi_dma_restart_bh(void *opaque)
scsi_write_data(&r->req);
break;
case SCSI_REQ_STATUS_RETRY_FLUSH:
- ret = scsi_disk_emulate_command(r);
- if (ret == 0) {
- scsi_req_complete(&r->req, GOOD);
- }
+ scsi_send_command(&r->req, r->req.cmd.buf);
+ break;
}
}
}
--
1.7.6
- [Qemu-devel] [PATCH v2 19/33] scsi: add channel to addressing, (continued)
- [Qemu-devel] [PATCH v2 19/33] scsi: add channel to addressing, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 31/33] scsi: make reqops const, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 28/33] scsi-disk: remove cluster_size, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 29/33] scsi-disk: small clean up to INQUIRY, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 20/33] scsi-disk: fail READ CAPACITY if LBA != 0 but PMI == 0, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 23/33] scsi-generic: remove scsi_req_fixup, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 33/33] scsi: pass cdb to alloc_req, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 27/33] scsi-disk: do not duplicate BlockDriverState member, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 26/33] scsi-generic: snoop READ CAPACITY commands to get block size, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 25/33] scsi-generic: look at host status, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 21/33] scsi-disk: fix retrying a flush,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 16/33] scsi: remove devs array from SCSIBus, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 15/33] qdev: switch children device list to QTAILQ, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 18/33] scsi: allow arbitrary LUNs, Paolo Bonzini, 2011/10/25
- [Qemu-devel] [PATCH v2 14/33] scsi: move tcq/ndev to SCSIBusOps (now SCSIBusInfo), Paolo Bonzini, 2011/10/25
- [Qemu-devel] ping Re: [PULL v2 00/33] SCSI changes for 1.0, part 1 of 2, Paolo Bonzini, 2011/10/27