From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKnhA-0005mW-NW for qemu-devel@nongnu.org; Thu, 30 Jul 2015 09:16:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZKnh5-0004Bs-6N for qemu-devel@nongnu.org; Thu, 30 Jul 2015 09:16:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52425) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKnh5-0004Bc-2B for qemu-devel@nongnu.org; Thu, 30 Jul 2015 09:16:19 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id C4E9C96C6 for ; Thu, 30 Jul 2015 13:16:18 +0000 (UTC) From: Stefan Hajnoczi Date: Thu, 30 Jul 2015 14:16:12 +0100 Message-Id: <1438262173-11546-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1438262173-11546-1-git-send-email-stefanha@redhat.com> References: <1438262173-11546-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH for-2.4 2/3] scsi-disk: fix cmd.mode field typo List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Stefan Hajnoczi The cmd.xfer field is the data length. The cmd.mode field is the data transfer direction. scsi_handle_rw_error() was using the wrong error policy for read requests. Signed-off-by: Stefan Hajnoczi --- hw/scsi/scsi-disk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 64f0694..73fed3f 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -399,7 +399,7 @@ static void scsi_read_data(SCSIRequest *req) */ static int scsi_handle_rw_error(SCSIDiskReq *r, int error) { - bool is_read = (r->req.cmd.xfer == SCSI_XFER_FROM_DEV); + bool is_read = (r->req.cmd.mode == SCSI_XFER_FROM_DEV); SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); BlockErrorAction action = blk_get_error_action(s->qdev.conf.blk, is_read, error); -- 2.4.3