diff options
| author | Paolo Bonzini | 2011-10-25 12:53:33 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2011-10-28 19:25:52 +0200 |
| commit | e88c591d63ed1bc8520f4f276bebd77c22e4ec72 (patch) | |
| tree | 5c12cbd48d40a4f27a7ea04dd4a2b04ef1485e8a /trace-events | |
| parent | scsi: pass cdb to alloc_req (diff) | |
| download | qemu-e88c591d63ed1bc8520f4f276bebd77c22e4ec72.tar.gz qemu-e88c591d63ed1bc8520f4f276bebd77c22e4ec72.tar.xz qemu-e88c591d63ed1bc8520f4f276bebd77c22e4ec72.zip | |
scsi: do not call transfer_data after canceling a request
Otherwise, if cancellation is "faked" by the AIO layer and goes
through qemu_aio_flush, the whole request is completed synchronously
during scsi_req_cancel.
Using the enqueued flag would work here, but not in the next patches,
so I'm introducing a new io_canceled flag. That's because scsi_req_data
is a synchronous callback and the enqueued flag might be reset by the
time it returns. scsi-disk cannot unref the request until after calling
scsi_req_data.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'trace-events')
| -rw-r--r-- | trace-events | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/trace-events b/trace-events index a8880550b2..56443af727 100644 --- a/trace-events +++ b/trace-events @@ -278,6 +278,7 @@ usb_host_claim_port(int bus, int hub, int port) "bus %d, hub addr %d, port %d" # hw/scsi-bus.c scsi_req_alloc(int target, int lun, int tag) "target %d lun %d tag %d" scsi_req_data(int target, int lun, int tag, int len) "target %d lun %d tag %d len %d" +scsi_req_data_canceled(int target, int lun, int tag, int len) "target %d lun %d tag %d len %d" scsi_req_dequeue(int target, int lun, int tag) "target %d lun %d tag %d" scsi_req_continue(int target, int lun, int tag) "target %d lun %d tag %d" scsi_req_parsed(int target, int lun, int tag, int cmd, int mode, int xfer) "target %d lun %d tag %d command %d dir %d length %d" |