From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsqKc-0005bS-5y for qemu-devel@nongnu.org; Thu, 14 May 2015 06:25:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsqKX-0002HA-RJ for qemu-devel@nongnu.org; Thu, 14 May 2015 06:25:33 -0400 Received: from [59.151.112.132] (port=57125 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsqKX-0002CF-Fw for qemu-devel@nongnu.org; Thu, 14 May 2015 06:25:29 -0400 Message-ID: <55547907.5000203@cn.fujitsu.com> Date: Thu, 14 May 2015 18:29:27 +0800 From: Wen Congyang MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v2] mirror: correct buf_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devl , Kevin Wolf , Jeff Cody , Paolo Bonzini , Fam Zheng If buf_size % granularity is not 0, mirror_free_init() will do dangerous things. Signed-off-by: Wen Congyang --- block/mirror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/mirror.c b/block/mirror.c index 58f391a..9521212 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -684,7 +684,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