From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6IrO-0000Wz-14 for qemu-devel@nongnu.org; Thu, 23 Jan 2014 06:54:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6IrH-0006WC-An for qemu-devel@nongnu.org; Thu, 23 Jan 2014 06:54:13 -0500 Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 23 Jan 2014 12:53:53 +0100 Message-Id: <1390478036-5507-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1390478036-5507-1-git-send-email-pbonzini@redhat.com> References: <1390478036-5507-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 2/5] virtio-scsi: Cleanup of I/Os that never started List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eric Farman , qemu-stable@nongnu.org From: Eric Farman There is still a small window that occurs when a cancel I/O affects an asynchronous I/O operation that hasn't started. In other words, when the residual data length equals the expected data length. Today, the routine virtio_scsi_command_complete fails because the VirtIOSCSIReq pointer (from the hba_private field in SCSIRequest) was cleared earlier when virtio_scsi_complete_req was called by the virtio_scsi_request_cancelled routine. As a result, the virtio_scsi_command_complete routine needs to simply return when it is processing a SCSIRequest block that was marked canceled. Signed-off-by: Eric Farman Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- hw/scsi/virtio-scsi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 6dcdd1b..1da98cd 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -306,6 +306,10 @@ static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status, VirtIOSCSIReq *req = r->hba_private; uint32_t sense_len; + if (r->io_canceled) { + return; + } + req->resp.cmd->response = VIRTIO_SCSI_S_OK; req->resp.cmd->status = status; if (req->resp.cmd->status == GOOD) { -- 1.8.3.1