From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43921)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1Yb1pW-0007dj-Kr
	for qemu-devel@nongnu.org; Thu, 26 Mar 2015 03:03:51 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1Yb1pV-0006gM-Oj
	for qemu-devel@nongnu.org; Thu, 26 Mar 2015 03:03:50 -0400
Date: Thu, 26 Mar 2015 15:03:41 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20150326070341.GH14724@ad.nay.redhat.com>
References: <1427276174-9130-1-git-send-email-wency@cn.fujitsu.com>
	<1427276174-9130-13-git-send-email-wency@cn.fujitsu.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1427276174-9130-13-git-send-email-wency@cn.fujitsu.com>
Subject: Re: [Qemu-devel] [RFC PATCH COLO v2 12/13] skip nbd_target when
 starting block replication
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: Wen Congyang <wency@cn.fujitsu.com>
Cc: Kevin Wolf <kwolf@redhat.com>, Yang Hongyang <yanghy@cn.fujitsu.com>, Lai Jiangshan <laijs@cn.fujitsu.com>, qemu block <qemu-block@nongnu.org>, Jiang Yunhong <yunhong.jiang@intel.com>, Dong Eddie <eddie.dong@intel.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, qemu devel <qemu-devel@nongnu.org>, Gonglei <arei.gonglei@huawei.com>, Stefan Hajnoczi <stefanha@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Max Reitz <mreitz@redhat.com>, zhanghailiang <zhang.zhanghailiang@huawei.com>

On Wed, 03/25 17:36, Wen Congyang wrote:
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
> ---
>  block.c | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/block.c b/block.c
> index bd7fa9c..3af5ad4 100644
> --- a/block.c
> +++ b/block.c
> @@ -6368,6 +6368,12 @@ BlockAcctStats *bdrv_get_stats(BlockDriverState *bs)
>  void bdrv_start_replication(BlockDriverState *bs, COLOMode mode, Error **errp)
>  {
>      BlockDriver *drv = bs->drv;
> +    Error *local_err = NULL;
> +
> +    if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_BACKING_REFERENCE, &local_err)) {
> +        error_free(local_err);

local_err is set but not used, just pass NULL. Same below.

> +        return;
> +    }
>  
>      if (drv && drv->bdrv_start_replication) {
>          drv->bdrv_start_replication(bs, mode, errp);
> @@ -6381,6 +6387,12 @@ void bdrv_start_replication(BlockDriverState *bs, COLOMode mode, Error **errp)
>  void bdrv_do_checkpoint(BlockDriverState *bs, Error **errp)
>  {
>      BlockDriver *drv = bs->drv;
> +    Error *local_err = NULL;
> +
> +    if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_BACKING_REFERENCE, &local_err)) {
> +        error_free(local_err);
> +        return;
> +    }
>  
>      if (drv && drv->bdrv_do_checkpoint) {
>          drv->bdrv_do_checkpoint(bs, errp);
> @@ -6394,6 +6406,12 @@ void bdrv_do_checkpoint(BlockDriverState *bs, Error **errp)
>  void bdrv_stop_replication(BlockDriverState *bs, Error **errp)
>  {
>      BlockDriver *drv = bs->drv;
> +    Error *local_err = NULL;
> +
> +    if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_BACKING_REFERENCE, &local_err)) {
> +        error_free(local_err);
> +        return;
> +    }
>  
>      if (drv && drv->bdrv_stop_replication) {
>          drv->bdrv_stop_replication(bs, errp);
> -- 
> 2.1.0
>