From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REJ5u-0006Yo-Ip for qemu-devel@nongnu.org; Thu, 13 Oct 2011 07:05:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1REJ5m-0004Fp-T1 for qemu-devel@nongnu.org; Thu, 13 Oct 2011 07:04:53 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:55103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REJ5m-0004Az-OJ for qemu-devel@nongnu.org; Thu, 13 Oct 2011 07:04:50 -0400 Received: by mail-ww0-f53.google.com with SMTP id 14so1336492wwg.10 for ; Thu, 13 Oct 2011 04:04:50 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 13 Oct 2011 13:03:50 +0200 Message-Id: <1318503845-11473-21-git-send-email-pbonzini@redhat.com> In-Reply-To: <1318503845-11473-1-git-send-email-pbonzini@redhat.com> References: <1318503845-11473-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 20/35] 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 b041fd5..d4f773f 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -231,6 +231,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(RUN_STATE_IO_ERROR); bdrv_iostatus_set_err(s->bs, error); + return 1; } else { switch (error) { case ENOMEDIUM: @@ -247,8 +248,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