diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-10 19:30:45 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-10 19:30:45 -0500 |
| commit | 6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a (patch) | |
| tree | bbc9dfa80b663da38fe05baad2d2f18742bab6e2 /hw/scsi-bus.c | |
| parent | 44ab9ed4f859fc6f691ba433c24d354ba93f056f (diff) | |
| parent | 0c92e0e6b64c9061f7365a2712b9055ea35b52f9 (diff) | |
| download | qemu-6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a.zip qemu-6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a.tar.gz qemu-6d06368d6bebad74fd16ef76a6bbea0c1cb63c9a.tar.bz2 | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
# By Paolo Bonzini (4) and Peter Lieven (2)
# Via Paolo Bonzini
* bonzini/scsi-next:
scsi-disk: handle io_canceled uniformly and correctly
scsi-disk: do not complete canceled UNMAP requests
scsi: do not call scsi_read_data/scsi_write_data for a canceled request
iscsi: look for pkg-config file too
iscsi: add iscsi_truncate support
iscsi: retry read, write, flush and unmap on unit attention check conditions
Diffstat (limited to 'hw/scsi-bus.c')
| -rw-r--r-- | hw/scsi-bus.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index a97f1cd..01e1dec 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1508,6 +1508,10 @@ void scsi_req_unref(SCSIRequest *req) will start the next chunk or complete the command. */ void scsi_req_continue(SCSIRequest *req) { + if (req->io_canceled) { + trace_scsi_req_continue_canceled(req->dev->id, req->lun, req->tag); + return; + } trace_scsi_req_continue(req->dev->id, req->lun, req->tag); if (req->cmd.mode == SCSI_XFER_TO_DEV) { req->ops->write_data(req); |