diff options
| author | Eric Blake <eblake@redhat.com> | 2016-06-23 16:37:11 -0600 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2016-08-05 15:09:13 -0500 |
| commit | 44152ece75c5d5631349e44fbd8defe9ef0b3769 (patch) | |
| tree | a857813f83d8f67d7d2d47242ea37c5b7ddb5c47 | |
| parent | c9fb07ba56ae4d8f4eaa6e461179017624b23355 (diff) | |
| download | qemu-44152ece75c5d5631349e44fbd8defe9ef0b3769.tar.gz | |
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 efaf4781a995aacd22b1dd521b14e4644bafae14)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/scsi/scsi-generic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 71372a8383..c4ba9a4854 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -225,7 +225,8 @@ static void scsi_read_complete(void * opaque, int ret) if (s->type == TYPE_DISK && r->req.cmd.buf[0] == INQUIRY && 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) { stl_be_p(&r->buf[8], max_xfer_len); /* Also take care of the opt xfer len. */ |