From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xi4eW-0000QZ-GX for qemu-devel@nongnu.org; Sat, 25 Oct 2014 12:57:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xi4eL-00008P-0N for qemu-devel@nongnu.org; Sat, 25 Oct 2014 12:57:20 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:35231 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xi4eK-00007w-NN for qemu-devel@nongnu.org; Sat, 25 Oct 2014 12:57:08 -0400 From: Peter Lieven Date: Sat, 25 Oct 2014 18:55:51 +0200 Message-Id: <1414256153-10148-5-git-send-email-pl@kamp.de> In-Reply-To: <1414256153-10148-1-git-send-email-pl@kamp.de> References: <1414256153-10148-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv3 4/6] hw/virtio-blk: add a constant for max number of merged requests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, benoit@irqsave.net, Peter Lieven , armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com As it was not obvious (at least for me) where the 32 comes from; add a constant for it. Signed-off-by: Peter Lieven Reviewed-by: Max Reitz --- hw/block/virtio-blk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index b19b102..ee7789f 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -308,6 +308,8 @@ static bool virtio_blk_sect_range_ok(VirtIOBlock *dev, return true; } +#define MAX_MERGE_REQS 32 + static void virtio_blk_handle_write(VirtIOBlockReq *req, MultiReqBuffer *mrb) { BlockRequest *blkreq; @@ -326,7 +328,7 @@ static void virtio_blk_handle_write(VirtIOBlockReq *req, MultiReqBuffer *mrb) block_acct_start(blk_get_stats(req->dev->blk), &req->acct, req->qiov.size, BLOCK_ACCT_WRITE); - if (mrb->num_writes == 32) { + if (mrb->num_writes == MAX_MERGE_REQS) { virtio_submit_multiwrite(req->dev->blk, mrb); } -- 1.7.9.5