Commit 890e48d7 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by Peter Maydell
Browse files

scsi-disk: fix reads from scsi-disk devices 



Commit fcaafb10 accidentally broke reads from
scsi-disk devices when being updated from its original form to use the new
byte-based block functions. Add the extra missing sector to offset conversion
in order to restore read functionality.

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Tested-by: default avatarxiaoqiang zhao <zxq_yx_007@163.com>
Message-id: 1464931021-25117-1-git-send-email-mark.cave-ayland@ilande.co.uk
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 8625c3ff

hw/scsi/scsi-disk.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static void scsi_do_read(SCSIDiskReq *r, int ret) 
        scsi_init_iovec(r, SCSI_DMA_BUF_SIZE);

        block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct,

                         r->qiov.size, BLOCK_ACCT_READ);

        r->req.aiocb = sdc->dma_readv(r->sector, &r->qiov,

        r->req.aiocb = sdc->dma_readv(r->sector << BDRV_SECTOR_BITS, &r->qiov,

                                      scsi_read_complete, r, r);

    }