diff options
| author | Eric Blake <eblake@redhat.com> | 2016-06-23 16:37:12 -0600 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-07-05 16:46:25 +0200 |
| commit | 24ce9a20260713e86377cfa78fb8699335759f4f (patch) | |
| tree | 9896792aec32b6b6153778828641071f8e1c238d /hw | |
| parent | efaf4781a995aacd22b1dd521b14e4644bafae14 (diff) | |
block: Give nonzero result to blk_get_max_transfer_length()
Making all callers special-case 0 as unlimited is awkward,
and we DO have a hard maximum of BDRV_REQUEST_MAX_SECTORS given
our current block layer API limits.
In the case of scsi, this means that we now always advertise a
limit to the guest, even in cases where the underlying layers
previously use 0 for no inherent limit beyond the block layer.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/virtio-blk.c | 3 | ||||
| -rw-r--r-- | hw/scsi/scsi-generic.c | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index fb43bbaa46..dd94cd4dc7 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -384,7 +384,7 @@ static int multireq_compare(const void *a, const void *b) void virtio_blk_submit_multireq(BlockBackend *blk, MultiReqBuffer *mrb) { int i = 0, start = 0, num_reqs = 0, niov = 0, nb_sectors = 0; - int max_xfer_len = 0; + int max_xfer_len; int64_t sector_num = 0; if (mrb->num_reqs == 1) { @@ -394,7 +394,6 @@ void virtio_blk_submit_multireq(BlockBackend *blk, MultiReqBuffer *mrb) } max_xfer_len = blk_get_max_transfer_length(mrb->reqs[0]->dev->blk); - max_xfer_len = MIN_NON_ZERO(max_xfer_len, BDRV_REQUEST_MAX_SECTORS); qsort(mrb->reqs, mrb->num_reqs, sizeof(*mrb->reqs), &multireq_compare); diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 75e227de95..0cb8568f1f 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -227,12 +227,12 @@ static void scsi_read_complete(void * opaque, int ret) r->req.cmd.buf[2] == 0xb0) { 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. */ - if (ldl_be_p(&r->buf[12]) > max_xfer_len) { - stl_be_p(&r->buf[12], max_xfer_len); - } + + assert(max_xfer_len); + stl_be_p(&r->buf[8], max_xfer_len); + /* Also take care of the opt xfer len. */ + if (ldl_be_p(&r->buf[12]) > max_xfer_len) { + stl_be_p(&r->buf[12], max_xfer_len); } } scsi_req_data(&r->req, len); |