From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCOSn-0002Mg-2Y for qemu-devel@nongnu.org; Tue, 07 Jul 2015 04:42:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCOSm-0003vF-6i for qemu-devel@nongnu.org; Tue, 07 Jul 2015 04:42:48 -0400 From: Wen Congyang Date: Tue, 7 Jul 2015 16:43:13 +0800 Message-ID: <1436258596-1253-16-git-send-email-wency@cn.fujitsu.com> In-Reply-To: <1436258596-1253-1-git-send-email-wency@cn.fujitsu.com> References: <1436258596-1253-1-git-send-email-wency@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-BLOCK v8 15/18] skip nbd_target when starting block replication List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu devel , Fam Zheng , Max Reitz , Paolo Bonzini , Stefan Hajnoczi Cc: Kevin Wolf , qemu block , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , "Michael R. Hines" , Gonglei , Yang Hongyang , zhanghailiang Signed-off-by: Wen Congyang Signed-off-by: zhanghailiang Signed-off-by: Gonglei --- block.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/block.c b/block.c index 5778064..0a6691e 100644 --- a/block.c +++ b/block.c @@ -4335,6 +4335,10 @@ void bdrv_start_replication(BlockDriverState *bs, ReplicationMode mode, { BlockDriver *drv = bs->drv; + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_BACKING_REFERENCE, NULL)) { + return; + } + if (drv && drv->bdrv_start_replication) { drv->bdrv_start_replication(bs, mode, errp); } else if (bs->file) { @@ -4348,6 +4352,10 @@ void bdrv_do_checkpoint(BlockDriverState *bs, Error **errp) { BlockDriver *drv = bs->drv; + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_BACKING_REFERENCE, NULL)) { + return; + } + if (drv && drv->bdrv_do_checkpoint) { drv->bdrv_do_checkpoint(bs, errp); } else if (bs->file) { @@ -4361,6 +4369,10 @@ void bdrv_stop_replication(BlockDriverState *bs, bool failover, Error **errp) { BlockDriver *drv = bs->drv; + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_BACKING_REFERENCE, NULL)) { + return; + } + if (drv && drv->bdrv_stop_replication) { drv->bdrv_stop_replication(bs, failover, errp); } else if (bs->file) { -- 2.4.3