From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RC6H6-0007rI-MS for qemu-devel@nongnu.org; Fri, 07 Oct 2011 04:59:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RC6H5-0005hk-KJ for qemu-devel@nongnu.org; Fri, 07 Oct 2011 04:59:24 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:43740) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RC6H5-0005hM-Ep for qemu-devel@nongnu.org; Fri, 07 Oct 2011 04:59:23 -0400 Received: by mail-bw0-f45.google.com with SMTP id zv15so4509282bkb.4 for ; Fri, 07 Oct 2011 01:59:23 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 7 Oct 2011 10:59:12 +0200 Message-Id: <1317977954-21366-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1317977954-21366-1-git-send-email-pbonzini@redhat.com> References: <1317977954-21366-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] scsi-disk: do not complete requests twice List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org When scsi_handle_rw_error reports a CHECK CONDITION code, the owner should not call scsi_req_complete. Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 4757a02..6497655 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -230,6 +230,7 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type) bdrv_mon_event(s->bs, BDRV_ACTION_STOP, is_read); vm_stop(RSTATE_IO_ERROR); + return 1; } else { switch (error) { case ENOMEDIUM: @@ -246,8 +247,8 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type) break; } bdrv_mon_event(s->bs, BDRV_ACTION_REPORT, is_read); + return 0; } - return 1; } static void scsi_write_complete(void * opaque, int ret) -- 1.7.6