提交 628e95b6 编写于 作者: P Paolo Bonzini 提交者: Kevin Wolf

scsi-disk: fix retrying a flush

Flush does not go anymore through scsi_disk_emulate_command.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
上级 7cec78b6
...@@ -81,7 +81,7 @@ struct SCSIDiskState ...@@ -81,7 +81,7 @@ struct SCSIDiskState
}; };
static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type); 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) static void scsi_free_request(SCSIRequest *req)
{ {
...@@ -325,7 +325,6 @@ static void scsi_dma_restart_bh(void *opaque) ...@@ -325,7 +325,6 @@ static void scsi_dma_restart_bh(void *opaque)
r = DO_UPCAST(SCSIDiskReq, req, req); r = DO_UPCAST(SCSIDiskReq, req, req);
if (r->status & SCSI_REQ_STATUS_RETRY) { if (r->status & SCSI_REQ_STATUS_RETRY) {
int status = r->status; int status = r->status;
int ret;
r->status &= r->status &=
~(SCSI_REQ_STATUS_RETRY | SCSI_REQ_STATUS_RETRY_TYPE_MASK); ~(SCSI_REQ_STATUS_RETRY | SCSI_REQ_STATUS_RETRY_TYPE_MASK);
...@@ -338,10 +337,8 @@ static void scsi_dma_restart_bh(void *opaque) ...@@ -338,10 +337,8 @@ static void scsi_dma_restart_bh(void *opaque)
scsi_write_data(&r->req); scsi_write_data(&r->req);
break; break;
case SCSI_REQ_STATUS_RETRY_FLUSH: case SCSI_REQ_STATUS_RETRY_FLUSH:
ret = scsi_disk_emulate_command(r); scsi_send_command(&r->req, r->req.cmd.buf);
if (ret == 0) { break;
scsi_req_complete(&r->req, GOOD);
}
} }
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册