Commit 6f6710aa authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

scsi: do not call scsi_read_data/scsi_write_data for a canceled request 



Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3c33ea96

hw/scsi-bus.c

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

trace-events

+1 −0
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ scsi_req_data(int target, int lun, int tag, int len) "target %d lun %d tag %d le 
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_continue_canceled(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"

scsi_req_parsed_lba(int target, int lun, int tag, int cmd, uint64_t lba) "target %d lun %d tag %d command %d lba %"PRIu64

scsi_req_parse_bad(int target, int lun, int tag, int cmd) "target %d lun %d tag %d command %d"