From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 9 Jul 2015 09:56:46 +0000 (+0100)
Subject: block: replace IOV_MAX with BlockLimits.max_iov
X-Git-Tag: v2.6.0-rc0~250^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=222565f65c3fba6825912c2561de7831e514ef3c;p=thirdparty%2Fqemu.git

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 <stefanha@redhat.com>
---

diff --git a/block/io.c b/block/io.c
index 42050a05988..63e3678036e 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;
         }
 
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index f72d4b60690..51f867b5135 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -414,7 +414,7 @@ void virtio_blk_submit_multireq(BlockBackend *blk, MultiReqBuffer *mrb)
              * 3. merge would exceed maximum transfer length of backend device
              */
             if (sector_num + nb_sectors != req->sector_num ||
-                niov > IOV_MAX - req->qiov.niov ||
+                niov > blk_get_max_iov(blk) - req->qiov.niov ||
                 req->qiov.size / BDRV_SECTOR_SIZE > max_xfer_len ||
                 nb_sectors > max_xfer_len - req->qiov.size / BDRV_SECTOR_SIZE) {
                 submit_requests(blk, mrb, start, num_reqs, niov);