From patchwork Tue Oct 25 10:40:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 121639 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CEEB31007D9 for ; Tue, 25 Oct 2011 23:21:01 +1100 (EST) Received: from localhost ([::1]:48454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIg02-0004IF-Rq for incoming@patchwork.ozlabs.org; Tue, 25 Oct 2011 08:20:58 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIeRj-0000k4-Jv for qemu-devel@nongnu.org; Tue, 25 Oct 2011 06:41:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIeRV-0006Mf-Rs for qemu-devel@nongnu.org; Tue, 25 Oct 2011 06:41:26 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:49684) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIeRU-0006FG-If for qemu-devel@nongnu.org; Tue, 25 Oct 2011 06:41:13 -0400 Received: by mail-wy0-f173.google.com with SMTP id 15so379083wyh.4 for ; Tue, 25 Oct 2011 03:41:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=+Z6TxlyrvF6at8pBI9vyyvu0/mJILOGlxTnRryxhPwQ=; b=VeKhSx3XghubJB9ZkIk4dmJP70GOvc9EeQ02pJ3YHTsQyAIxsBiXdap+eHU9mKkYh9 mEuP0+NstnKTj21Bd3Ah9CSjD/8nc8MQmlhoQoLQTiyYPMAMYXhT7CMDhbulTqKfHZTm EaejSb7GHETbI5UAeBi5H07l2IlHLxZAaOFhI= Received: by 10.216.136.33 with SMTP id v33mr4498186wei.96.1319539271930; Tue, 25 Oct 2011 03:41:11 -0700 (PDT) Received: from localhost.localdomain (93-34-199-98.ip51.fastwebnet.it. [93.34.199.98]) by mx.google.com with ESMTPS id fr4sm15677349wbb.0.2011.10.25.03.41.10 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Oct 2011 03:41:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 25 Oct 2011 12:40:29 +0200 Message-Id: <1319539241-26436-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1319539241-26436-1-git-send-email-pbonzini@redhat.com> References: <1319539241-26436-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH v2 21/33] scsi-disk: fix retrying a flush X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Flush does not go anymore through scsi_disk_emulate_command. Signed-off-by: Paolo Bonzini --- 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; } } }