diff options
| author | Mark Cave-Ayland | 2016-06-03 07:17:01 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-06-06 14:23:41 +0200 |
| commit | 890e48d7fc7d2ba490610b7ccaa3f479b5f3c1b1 (patch) | |
| tree | 61fa7381c812e173442e2d54ed3eb146237497a8 /hw/scsi/scsi-disk.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20160606-1' into... (diff) | |
| download | qemu-890e48d7fc7d2ba490610b7ccaa3f479b5f3c1b1.tar.gz qemu-890e48d7fc7d2ba490610b7ccaa3f479b5f3c1b1.tar.xz qemu-890e48d7fc7d2ba490610b7ccaa3f479b5f3c1b1.zip | |
scsi-disk: fix reads from scsi-disk devices
Commit fcaafb1001b9c42817714dd3b2aadcfdb997b53d 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: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: xiaoqiang zhao <zxq_yx_007@163.com>
Message-id: 1464931021-25117-1-git-send-email-mark.cave-ayland@ilande.co.uk
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/scsi/scsi-disk.c')
| -rw-r--r-- | hw/scsi/scsi-disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index ace65e0720..ab7cf9cbf8 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -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); } |