falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: Advertise limits by blocksize, not 512 

s->blocksize may be larger than 512, in which case our
tweaks to max_xfer_len and opt_xfer_len must be scaled
appropriately.

CC: qemu-stable@nongnu.org
Reported-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit efaf4781a9)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Eric Blake 2016-06-23 16:37:11 -06:00 committed by Michael Roth
parent c9fb07ba56
commit 44152ece75
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/scsi/scsi-generic.c
View File

@ -225,7 +225,8 @@ static void scsi_read_complete(void * opaque, int ret)
if (s->type == TYPE_DISK && if (s->type == TYPE_DISK &&
r->req.cmd.buf[0] == INQUIRY && r->req.cmd.buf[0] == INQUIRY &&
r->req.cmd.buf[2] == 0xb0) { r->req.cmd.buf[2] == 0xb0) {
uint32_t max_xfer_len = blk_get_max_transfer_length(s->conf.blk); uint32_t max_xfer_len = blk_get_max_transfer_length(s->conf.blk) /
(s->blocksize / BDRV_SECTOR_SIZE);
if (max_xfer_len) { if (max_xfer_len) {
stl_be_p(&r->buf[8], max_xfer_len); stl_be_p(&r->buf[8], max_xfer_len);
/* Also take care of the opt xfer len. */ /* Also take care of the opt xfer len. */