Commit efaf4781 authored by Eric Blake's avatar Eric Blake Committed by Kevin Wolf
Browse files

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: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent f9e95af0

hw/scsi/scsi-generic.c

+2 −1
Original line number Diff line number Diff line
@@ -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. */