Commit e9c0f0f5 authored by Eric Farman's avatar Eric Farman Committed by Paolo Bonzini
Browse files

virtio-scsi: Cleanup of I/Os that never started 



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: default avatarEric Farman <farman@linux.vnet.ibm.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 33325a53

hw/scsi/virtio-scsi.c

+4 −0
Original line number Diff line number Diff line
@@ -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) {