From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XyZqQ-0008F6-50 for qemu-devel@nongnu.org; Wed, 10 Dec 2014 00:29:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XyZqL-0004Uq-7Q for qemu-devel@nongnu.org; Wed, 10 Dec 2014 00:29:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XyZqK-0004Uf-Vv for qemu-devel@nongnu.org; Wed, 10 Dec 2014 00:29:45 -0500 Date: Wed, 10 Dec 2014 12:54:35 +0800 From: Fam Zheng Message-ID: <20141210045435.GA32726@ad.nay.redhat.com> References: <1418142410-19057-1-git-send-email-pl@kamp.de> <1418142410-19057-3-git-send-email-pl@kamp.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1418142410-19057-3-git-send-email-pl@kamp.de> Subject: Re: [Qemu-devel] [PATCH 2/4] 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: Peter Lieven Cc: kwolf@redhat.com, benoit@irqsave.net, qemu-devel@nongnu.org, ming.lei@canonical.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com On Tue, 12/09 17:26, Peter Lieven wrote: > 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: Eric Blake > --- > hw/block/virtio-blk.c | 2 +- > include/hw/virtio/virtio-blk.h | 4 +++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c > index b19b102..490f961 100644 > --- a/hw/block/virtio-blk.c > +++ b/hw/block/virtio-blk.c > @@ -326,7 +326,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 == VIRTIO_BLK_MAX_MERGE_REQS) { > virtio_submit_multiwrite(req->dev->blk, mrb); > } > > diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h > index 3979dc4..3f2652f 100644 > --- a/include/hw/virtio/virtio-blk.h > +++ b/include/hw/virtio/virtio-blk.h > @@ -134,8 +134,10 @@ typedef struct VirtIOBlock { > struct VirtIOBlockDataPlane *dataplane; > } VirtIOBlock; > > +#define VIRTIO_BLK_MAX_MERGE_REQS 32 > + > typedef struct MultiReqBuffer { > - BlockRequest blkreq[32]; > + BlockRequest blkreq[VIRTIO_BLK_MAX_MERGE_REQS]; > unsigned int num_writes; > } MultiReqBuffer; > > -- > 1.7.9.5 > > Reviewed-by: Fam Zheng