From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4kEh-0005zM-Ny for qemu-devel@nongnu.org; Tue, 16 Jun 2015 02:20:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4kEe-0004DT-Fh for qemu-devel@nongnu.org; Tue, 16 Jun 2015 02:20:39 -0400 Received: from [59.151.112.132] (port=28784 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4kEc-00047U-VX for qemu-devel@nongnu.org; Tue, 16 Jun 2015 02:20:36 -0400 Message-ID: <557FC11C.4050601@cn.fujitsu.com> Date: Tue, 16 Jun 2015 14:24:28 +0800 From: Wen Congyang MIME-Version: 1.0 References: <5555A588.3080907@cn.fujitsu.com> In-Reply-To: <5555A588.3080907@cn.fujitsu.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v5] mirror: correct buf_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devl , Fam Zheng , Jeff Cody Cc: Kevin Wolf , Paolo Bonzini Ping... On 05/15/2015 03:51 PM, Wen Congyang wrote: > If bus_size is less than 0, the command fails. > If buf_size is 0, use DEFAULT_MIRROR_BUF_SIZE. > If buf_size % granularity is not 0, mirror_free_init() will > do dangerous things. > > Signed-off-by: Wen Congyang > Reviewed-by: Fam Zheng > --- > block/mirror.c | 11 ++++++++++- > blockdev.c | 4 +--- > 2 files changed, 11 insertions(+), 4 deletions(-) > > diff --git a/block/mirror.c b/block/mirror.c > index 58f391a..25645ef 100644 > --- a/block/mirror.c > +++ b/block/mirror.c > @@ -19,6 +19,7 @@ > > #define SLICE_TIME 100000000ULL /* ns */ > #define MAX_IN_FLIGHT 16 > +#define DEFAULT_MIRROR_BUF_SIZE (10 << 20) > > /* The mirroring buffer is a list of granularity-sized chunks. > * Free chunks are organized in a list. > @@ -671,6 +672,14 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, > return; > } > > + if (buf_size < 0) { > + error_setg(errp, "Invalid parameter 'buf-size'"); > + return; > + } > + > + if (buf_size == 0) { > + buf_size = DEFAULT_MIRROR_BUF_SIZE; > + } > > s = block_job_create(driver, bs, speed, cb, opaque, errp); > if (!s) { > @@ -684,7 +693,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) { > diff --git a/blockdev.c b/blockdev.c > index 5eaf77e..95a0c6a 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -2619,8 +2619,6 @@ out: > aio_context_release(aio_context); > } > > -#define DEFAULT_MIRROR_BUF_SIZE (10 << 20) > - > void qmp_drive_mirror(const char *device, const char *target, > bool has_format, const char *format, > bool has_node_name, const char *node_name, > @@ -2661,7 +2659,7 @@ void qmp_drive_mirror(const char *device, const char *target, > granularity = 0; > } > if (!has_buf_size) { > - buf_size = DEFAULT_MIRROR_BUF_SIZE; > + buf_size = 0; > } > > if (granularity != 0 && (granularity < 512 || granularity > 1048576 * 64)) { >