From patchwork Thu Jun 18 08:49:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 486184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CF642140129 for ; Thu, 18 Jun 2015 18:54:07 +1000 (AEST) Received: from localhost ([::1]:51046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5VaH-0002HQ-Rr for incoming@patchwork.ozlabs.org; Thu, 18 Jun 2015 04:54:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5VSQ-0004xV-8q for qemu-devel@nongnu.org; Thu, 18 Jun 2015 04:46:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5VSP-0004DC-17 for qemu-devel@nongnu.org; Thu, 18 Jun 2015 04:45:58 -0400 Received: from [59.151.112.132] (port=57135 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5VSO-0003ho-E4; Thu, 18 Jun 2015 04:45:56 -0400 X-IronPort-AV: E=Sophos;i="5.13,625,1427731200"; d="scan'208";a="97256935" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 18 Jun 2015 16:49:49 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t5I8i3Sd019735; Thu, 18 Jun 2015 16:44:03 +0800 Received: from G08FNSTD140052.g08.fujitsu.local (10.167.226.52) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 18 Jun 2015 16:45:38 +0800 From: Wen Congyang To: qemu devel , Fam Zheng , Max Reitz , Paolo Bonzini Date: Thu, 18 Jun 2015 16:49:17 +0800 Message-ID: <1434617361-17778-13-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1434617361-17778-1-git-send-email-wency@cn.fujitsu.com> References: <1434617361-17778-1-git-send-email-wency@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.52] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Kevin Wolf , qemu block , Lai Jiangshan , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , Gonglei , Stefan Hajnoczi , Yang Hongyang , zhanghailiang Subject: [Qemu-devel] [PATCH COLO-Block v6 12/16] skip nbd_target when starting block replication X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 06222bf..2108d02 100644 --- a/block.c +++ b/block.c @@ -4430,6 +4430,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) { @@ -4443,6 +4447,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) { @@ -4456,6 +4464,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) {