From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHDMw-0006s4-NL for qemu-devel@nongnu.org; Fri, 30 Jan 2015 10:20:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHDMr-0005Ex-WF for qemu-devel@nongnu.org; Fri, 30 Jan 2015 10:20:26 -0500 Received: from mail-we0-x22a.google.com ([2a00:1450:400c:c03::22a]:54442) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHDMr-0005Ej-IE for qemu-devel@nongnu.org; Fri, 30 Jan 2015 10:20:21 -0500 Received: by mail-we0-f170.google.com with SMTP id w55so22294737wes.1 for ; Fri, 30 Jan 2015 07:20:21 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 30 Jan 2015 16:19:56 +0100 Message-Id: <1422631197-26063-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1422631197-26063-1-git-send-email-pbonzini@redhat.com> References: <1422631197-26063-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 10/11] scsi: Fix scsi_req_cancel_async for no aiocb req List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng From: Fam Zheng scsi_req_cancel_complete is responsible for releasing the request, so we shouldn't skip it in any case. This doesn't affect the only existing caller, virtio-scsi, but is useful for other devices once they use it. Suggested-by: Paolo Bonzini Signed-off-by: Fam Zheng Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-bus.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 9b740a3..db39ae0 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1756,6 +1756,8 @@ void scsi_req_cancel_async(SCSIRequest *req, Notifier *notifier) req->io_canceled = true; if (req->aiocb) { blk_aio_cancel_async(req->aiocb); + } else { + scsi_req_cancel_complete(req); } } -- 1.8.3.1