diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-10-04 15:36:05 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-10-28 19:25:51 +0200 |
| commit | 628e95b61650f00607e8ddcf952b2e93f6ac3c89 (patch) | |
| tree | 13122cbeee899e64dc9d693c15f55a0699b11589 /hw/scsi-disk.c | |
| parent | 7cec78b6f0e9a3b33732afd14a811849d219ffbc (diff) | |
scsi-disk: fix retrying a flush
Flush does not go anymore through scsi_disk_emulate_command.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/scsi-disk.c')
| -rw-r--r-- | 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 6b139acda..e800ab358 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; } } } |