From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yt4p1-0001RN-Qo for qemu-devel@nongnu.org; Thu, 14 May 2015 21:53:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yt4oy-0002NM-Bx for qemu-devel@nongnu.org; Thu, 14 May 2015 21:53:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59539) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yt4oy-0002N3-4f for qemu-devel@nongnu.org; Thu, 14 May 2015 21:53:52 -0400 Date: Fri, 15 May 2015 09:53:31 +0800 From: Fam Zheng Message-ID: <20150515015331.GA28144@ad.nay.redhat.com> References: <55554DBD.5000902@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55554DBD.5000902@cn.fujitsu.com> Subject: Re: [Qemu-devel] [PATCH v3] mirror: correct buf_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wen Congyang Cc: Kevin Wolf , Paolo Bonzini , Jeff Cody , qemu-devl On Fri, 05/15 09:37, Wen Congyang wrote: > If bus_size is less than 0, the command fails. > If buf_size % granularity is not 0, mirror_free_init() will > do dangerous things. > > Signed-off-by: Wen Congyang > --- > block/mirror.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/block/mirror.c b/block/mirror.c > index 58f391a..7732f8b 100644 > --- a/block/mirror.c > +++ b/block/mirror.c > @@ -671,6 +671,10 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, > return; > } > > + if (buf_size < 0) { > + error_setg(errp, "Invalid parameter '%s'", "buf-size"); Just "Invalid parameter 'buf-size'", If you fix that, Reviewed-by: Fam Zheng > + return; > + } > > s = block_job_create(driver, bs, speed, cb, opaque, errp); > if (!s) { > @@ -684,7 +688,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, > s->is_none_mode = is_none_mode; > s->base = base; > s->granularity = granularity; > - s->buf_size = MAX(buf_size, granularity); > + s->buf_size = ROUND_UP(buf_size, granularity); > > s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp); > if (!s->dirty_bitmap) { > -- > 2.1.0