From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKruY-00055S-9I for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKruW-0004O9-Vh for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKruW-0004Ny-M7 for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:20 -0400 From: Kevin Wolf Date: Mon, 31 Oct 2011 14:30:13 +0100 Message-Id: <1320067830-12093-39-git-send-email-kwolf@redhat.com> In-Reply-To: <1320067830-12093-1-git-send-email-kwolf@redhat.com> References: <1320067830-12093-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 38/55] scsi-disk: fix retrying a flush List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini Flush does not go anymore through scsi_disk_emulate_command. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- 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 6b139ac..e800ab3 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.4