From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45725)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <wency@cn.fujitsu.com>) id 1Yt9RZ-0000xd-3H
	for qemu-devel@nongnu.org; Fri, 15 May 2015 02:50:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wency@cn.fujitsu.com>) id 1Yt9RV-0006t2-0P
	for qemu-devel@nongnu.org; Fri, 15 May 2015 02:50:01 -0400
Received: from [59.151.112.132] (port=23714 helo=heian.cn.fujitsu.com)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <wency@cn.fujitsu.com>) id 1Yt9RU-0006qP-7z
	for qemu-devel@nongnu.org; Fri, 15 May 2015 02:49:56 -0400
Message-ID: <555597DC.4090208@cn.fujitsu.com>
Date: Fri, 15 May 2015 14:53:16 +0800
From: Wen Congyang <wency@cn.fujitsu.com>
MIME-Version: 1.0
References: <55554DBD.5000902@cn.fujitsu.com> <55559602.7040405@redhat.com>
In-Reply-To: <55559602.7040405@redhat.com>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v3] mirror: correct buf_size
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>, qemu-devl <qemu-devel@nongnu.org>, Fam Zheng <famz@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, Jeff Cody <jcody@redhat.com>

On 05/15/2015 02:45 PM, Paolo Bonzini wrote:
> 
> 
> On 15/05/2015 03: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 <wency@cn.fujitsu.com>
>> ---
>>  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) {
> 
> This should be <=.

But commit_active_start() passes 0...

Thanks
Wen Congyang

> 
> Jeff, can you adjust when committing?
> 
> Paolo
> 
>> +        error_setg(errp, "Invalid parameter '%s'", "buf-size");
>> +        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) {
>>
> .
>