[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/21] block: Add check on mirror target
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL 19/21] block: Add check on mirror target |
Date: |
Thu, 7 Jan 2016 23:57:33 +0100 |
From: Fam Zheng <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
blockdev.c | 3 +++
include/block/block.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index 22e06ba..f42e171 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3342,6 +3342,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 && sync == MIRROR_SYNC_MODE_TOP) {
sync = MIRROR_SYNC_MODE_FULL;
diff --git a/include/block/block.h b/include/block/block.h
index 8ea12fa..c96923d 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -170,6 +170,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.6.4
- [Qemu-devel] [PULL 08/21] iotests: 024: Use TEST_IMG override instead of "mv", (continued)
- [Qemu-devel] [PULL 08/21] iotests: 024: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 10/21] iotests: 034: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 11/21] iotests: 037: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 09/21] iotests: 028: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 12/21] iotests: 038: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 13/21] iotests: 050: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 14/21] iotests: 095: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 15/21] iotests: 095: Filter _img_info output, Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 17/21] block: Rename BLOCK_OP_TYPE_MIRROR to BLOCK_OP_TYPE_MIRROR_SOURCE, Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 18/21] block: Extract blockdev part of qmp_drive_mirror, Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 19/21] block: Add check on mirror target,
Max Reitz <=
- [Qemu-devel] [PULL 16/21] qemu-iotests: s390x: fix test 051, Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 20/21] qmp: Add blockdev-mirror command, Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 21/21] iotests: Add test cases for blockdev-mirror, Max Reitz, 2016/01/07
- Re: [Qemu-devel] [PULL 00/21] Block layer patches, Peter Maydell, 2016/01/08