diff options
| author | Eric Farman <farman@linux.vnet.ibm.com> | 2014-01-14 14:16:25 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-01-15 10:36:18 +0100 |
| commit | e9c0f0f58ad0a41c3c4b19e1911cfe095afc09ca (patch) | |
| tree | d2b82107f015daa573986a22d14bd9b5c485784c | |
| parent | 33325a53f15ab5370e1917b2a11cadffc77c5a52 (diff) | |
| download | focaccia-qemu-e9c0f0f58ad0a41c3c4b19e1911cfe095afc09ca.tar.gz focaccia-qemu-e9c0f0f58ad0a41c3c4b19e1911cfe095afc09ca.zip | |
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: Eric Farman <farman@linux.vnet.ibm.com> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/scsi/virtio-scsi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 6dcdd1b91c..1da98cd557 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) { |