From 222565f65c3fba6825912c2561de7831e514ef3c Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Thu, 9 Jul 2015 10:56:46 +0100 Subject: block: replace IOV_MAX with BlockLimits.max_iov Request merging must not result in a huge request that exceeds the maximum number of iovec elements. Use BlockLimits.max_iov instead of hardcoding IOV_MAX. Signed-off-by: Stefan Hajnoczi --- block/io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'block') diff --git a/block/io.c b/block/io.c index 42050a0598..63e3678036 100644 --- a/block/io.c +++ b/block/io.c @@ -1889,7 +1889,8 @@ static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs, merge = 1; } - if (reqs[outidx].qiov->niov + reqs[i].qiov->niov + 1 > IOV_MAX) { + if (reqs[outidx].qiov->niov + reqs[i].qiov->niov + 1 > + bs->bl.max_iov) { merge = 0; } -- cgit v1.2.3