openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: store unmap offset and nb_sectors in request struct 

it allows to report it in the error handler

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Message-id: 20190923121737.83281-6-anton.nefedov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Anton Nefedov 2019-09-23 15:17:33 +03:00 committed by Max Reitz
parent 99f18035b5
commit 6d0680823c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/scsi/scsi-disk.c
View File

@ -1608,8 +1608,6 @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
{ {
SCSIDiskReq *r = data->r; SCSIDiskReq *r = data->r;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
uint64_t sector_num;
uint32_t nb_sectors;
assert(r->req.aiocb == NULL); assert(r->req.aiocb == NULL);
if (scsi_disk_req_check_error(r, ret, false)) { if (scsi_disk_req_check_error(r, ret, false)) {
@ -1617,16 +1615,18 @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
} }
if (data->count > 0) { if (data->count > 0) {
sector_num = ldq_be_p(&data->inbuf[0]); r->sector = ldq_be_p(&data->inbuf[0])
nb_sectors = ldl_be_p(&data->inbuf[8]) & 0xffffffffULL; * (s->qdev.blocksize / BDRV_SECTOR_SIZE);
if (!check_lba_range(s, sector_num, nb_sectors)) { r->sector_count = (ldl_be_p(&data->inbuf[8]) & 0xffffffffULL)
* (s->qdev.blocksize / BDRV_SECTOR_SIZE);
if (!check_lba_range(s, r->sector, r->sector_count)) {
scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE)); scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
goto done; goto done;
} }
r->req.aiocb = blk_aio_pdiscard(s->qdev.conf.blk, r->req.aiocb = blk_aio_pdiscard(s->qdev.conf.blk,
sector_num * s->qdev.blocksize, r->sector * BDRV_SECTOR_SIZE,
nb_sectors * s->qdev.blocksize, r->sector_count * BDRV_SECTOR_SIZE,
scsi_unmap_complete, data); scsi_unmap_complete, data);
data->count--; data->count--;
data->inbuf += 16; data->inbuf += 16;