diff options
| -rw-r--r-- | hw/scsi-disk.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 6bc739d179..c9c983a5b7 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1493,13 +1493,17 @@ static void scsi_unmap_complete(void *opaque, int ret) uint32_t nb_sectors; r->req.aiocb = NULL; + if (r->req.io_canceled) { + goto done; + } + if (ret < 0) { if (scsi_handle_rw_error(r, -ret)) { goto done; } } - if (data->count > 0 && !r->req.io_canceled) { + if (data->count > 0) { sector_num = ldq_be_p(&data->inbuf[0]); nb_sectors = ldl_be_p(&data->inbuf[8]) & 0xffffffffULL; if (!check_lba_range(s, sector_num, nb_sectors)) { @@ -1516,10 +1520,9 @@ static void scsi_unmap_complete(void *opaque, int ret) return; } + scsi_req_complete(&r->req, GOOD); + done: - if (data->count == 0) { - scsi_req_complete(&r->req, GOOD); - } if (!r->req.io_canceled) { scsi_req_unref(&r->req); } |