Commit 6d068082 authored by Anton Nefedov's avatar Anton Nefedov Committed by Max Reitz
Browse files

scsi: store unmap offset and nb_sectors in request struct 



it allows to report it in the error handler

Signed-off-by: default avatarAnton Nefedov <anton.nefedov@virtuozzo.com>
Message-id: 20190923121737.83281-6-anton.nefedov@virtuozzo.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 99f18035

hw/scsi/scsi-disk.c

+7 −7
Original line number Diff line number Diff line
@@ -1608,8 +1608,6 @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret) 
{

    SCSIDiskReq *r = data->r;

    SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);

    uint64_t sector_num;

    uint32_t nb_sectors;



    assert(r->req.aiocb == NULL);

    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) {

        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)) {

        r->sector = ldq_be_p(&data->inbuf[0])

            * (s->qdev.blocksize / BDRV_SECTOR_SIZE);

        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));

            goto done;

        }



        r->req.aiocb = blk_aio_pdiscard(s->qdev.conf.blk,

                                        sector_num * s->qdev.blocksize,

                                        nb_sectors * s->qdev.blocksize,

                                        r->sector * BDRV_SECTOR_SIZE,

                                        r->sector_count * BDRV_SECTOR_SIZE,

                                        scsi_unmap_complete, data);

        data->count--;

        data->inbuf += 16;