From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z293L-0008R7-Dh for qemu-devel@nongnu.org; Mon, 08 Jun 2015 22:14:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z293K-0000oN-Ht for qemu-devel@nongnu.org; Mon, 08 Jun 2015 22:14:11 -0400 From: Fam Zheng Date: Tue, 9 Jun 2015 10:13:45 +0800 Message-Id: <1433816027-32588-5-git-send-email-famz@redhat.com> In-Reply-To: <1433816027-32588-1-git-send-email-famz@redhat.com> References: <1433816027-32588-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] block: Add check on mirror target List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, Jeff Cody , Markus Armbruster , mreitz@redhat.com, Stefan Hajnoczi , pbonzini@redhat.com Signed-off-by: Fam Zheng --- blockdev.c | 3 +++ include/block/block.h | 1 + 2 files changed, 4 insertions(+) diff --git a/blockdev.c b/blockdev.c index c32a9a9..44030da 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2929,6 +2929,9 @@ static void blockdev_mirror_common(BlockDriverState *bs, if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_MIRROR_SOURCE, errp)) { return; } + if (bdrv_op_is_blocked(target, BLOCK_OP_TYPE_MIRROR_TARGET, errp)) { + return; + } if (!bs->backing_hd && sync == MIRROR_SYNC_MODE_TOP) { sync = MIRROR_SYNC_MODE_FULL; diff --git a/include/block/block.h b/include/block/block.h index 69cb676..c96d47b 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -156,6 +156,7 @@ typedef enum BlockOpType { BLOCK_OP_TYPE_INTERNAL_SNAPSHOT, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT_DELETE, BLOCK_OP_TYPE_MIRROR_SOURCE, + BLOCK_OP_TYPE_MIRROR_TARGET, BLOCK_OP_TYPE_RESIZE, BLOCK_OP_TYPE_STREAM, BLOCK_OP_TYPE_REPLACE, -- 2.4.2