From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCrJf-0005tm-In for qemu-devel@nongnu.org; Wed, 08 Jul 2015 11:31:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCrJc-0001OS-GQ for qemu-devel@nongnu.org; Wed, 08 Jul 2015 11:31:19 -0400 From: Stefan Hajnoczi Date: Wed, 8 Jul 2015 16:31:01 +0100 Message-Id: <1436369462-24252-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1436369462-24252-1-git-send-email-stefanha@redhat.com> References: <1436369462-24252-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH for-2.5 3/4] block: replace IOV_MAX with BlockLimits.max_iov List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org 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 ++- hw/block/virtio-blk.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/block/io.c b/block/io.c index 6750de6..baffd02 100644 --- a/block/io.c +++ b/block/io.c @@ -1818,7 +1818,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 6aefda4..a186956 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -407,7 +407,7 @@ void virtio_blk_submit_multireq(BlockBackend *blk, MultiReqBuffer *mrb) bool merge = true; /* merge would exceed maximum number of IOVs */ - if (niov + req->qiov.niov > IOV_MAX) { + if (niov + req->qiov.niov > blk_get_max_iov(blk)) { merge = false; } -- 2.4.3