diff options
| author | Paolo Bonzini | 2021-06-16 15:13:49 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2021-06-25 10:54:13 +0200 |
| commit | b99f7fa08a3df8b8a6a907642e5851cdcf43fa9f (patch) | |
| tree | 4851aca87185e20bc960bc5231a5c24d4acdbfb7 /block | |
| parent | osdep: provide ROUND_DOWN macro (diff) | |
| download | qemu-b99f7fa08a3df8b8a6a907642e5851cdcf43fa9f.tar.gz qemu-b99f7fa08a3df8b8a6a907642e5851cdcf43fa9f.tar.xz qemu-b99f7fa08a3df8b8a6a907642e5851cdcf43fa9f.zip | |
block-backend: align max_transfer to request alignment
Block device requests must be aligned to bs->bl.request_alignment.
It makes sense for drivers to align bs->bl.max_transfer the same
way; however when there is no specified limit, blk_get_max_transfer
just returns INT_MAX. Since the contract of the function does not
specify that INT_MAX means "no maximum", just align the outcome
of the function (whether INT_MAX or bs->bl.max_transfer) before
returning it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/block-backend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index 15f1ea4288..6e37582740 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1957,12 +1957,12 @@ uint32_t blk_get_request_alignment(BlockBackend *blk) uint32_t blk_get_max_transfer(BlockBackend *blk) { BlockDriverState *bs = blk_bs(blk); - uint32_t max = 0; + uint32_t max = INT_MAX; if (bs) { - max = bs->bl.max_transfer; + max = MIN_NON_ZERO(max, bs->bl.max_transfer); } - return MIN_NON_ZERO(max, INT_MAX); + return ROUND_DOWN(max, blk_get_request_alignment(blk)); } int blk_get_max_iov(BlockBackend *blk) |