From 8751e448efc4d57513162059e7b9f4a8f86a83f6 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 22 Feb 2012 14:11:53 +0100 Subject: [PATCH 037/109] scsi-disk: fix retrying a flush RH-Author: Paolo Bonzini Message-id: <1329919979-20948-37-git-send-email-pbonzini@redhat.com> Patchwork-id: 37519 O-Subject: [RHEL 6.3 qemu-kvm PATCH v2 036/102] scsi-disk: fix retrying a flush Bugzilla: 782029 RH-Acked-by: Laszlo Ersek RH-Acked-by: Orit Wasserman RH-Acked-by: Gerd Hoffmann Flush does not go anymore through scsi_disk_emulate_command. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf (cherry picked from 628e95b61650f00607e8ddcf952b2e93f6ac3c89) --- hw/scsi-disk.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) Signed-off-by: Michal Novotny --- 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 b376c0b..1ca49db 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -78,7 +78,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) { @@ -356,7 +356,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); @@ -369,10 +368,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; } scsi_req_unref(&r->req); } -- 1.7.7.6