From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTCEn-0000WP-Sc for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:24:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UTCEm-0003DN-4l for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:24:29 -0400 Received: from mail-ea0-x22b.google.com ([2a00:1450:4013:c01::22b]:63773) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTCEl-0003DF-VD for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:24:28 -0400 Received: by mail-ea0-f171.google.com with SMTP id b15so1766689eae.30 for ; Fri, 19 Apr 2013 07:24:27 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 19 Apr 2013 16:24:12 +0200 Message-Id: <1366381460-6041-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1366381460-6041-1-git-send-email-pbonzini@redhat.com> References: <1366381460-6041-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/9] scsi: avoid assertion failure on VERIFY command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: asias@redhat.com, nab@linux-iscsi.org A verify command is not an actual read (we do not implement compare mode) and thus does not have an AIOCB attached. Do not crash in scsi_dma_complete. Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index f52bd11..c8d2a99 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -244,14 +244,15 @@ done: } } -static void scsi_dma_complete(void *opaque, int ret) +static void scsi_dma_complete_noio(void *opaque, int ret) { SCSIDiskReq *r = (SCSIDiskReq *)opaque; SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - assert(r->req.aiocb != NULL); - r->req.aiocb = NULL; - bdrv_acct_done(s->qdev.conf.bs, &r->acct); + if (r->req.aiocb != NULL) { + r->req.aiocb = NULL; + bdrv_acct_done(s->qdev.conf.bs, &r->acct); + } if (r->req.io_canceled) { goto done; } @@ -277,6 +278,14 @@ done: } } +static void scsi_dma_complete(void *opaque, int ret) +{ + SCSIDiskReq *r = (SCSIDiskReq *)opaque; + + assert(r->req.aiocb != NULL); + scsi_dma_complete_noio(opaque, ret); +} + static void scsi_read_complete(void * opaque, int ret) { SCSIDiskReq *r = (SCSIDiskReq *)opaque; @@ -496,7 +505,7 @@ static void scsi_write_data(SCSIRequest *req) if (r->req.cmd.buf[0] == VERIFY_10 || r->req.cmd.buf[0] == VERIFY_12 || r->req.cmd.buf[0] == VERIFY_16) { if (r->req.sg) { - scsi_dma_complete(r, 0); + scsi_dma_complete_noio(r, 0); } else { scsi_write_complete(r, 0); } -- 1.8.1.4