[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/21] block: Rename BLOCK_OP_TYPE_MIRROR to BLOCK_OP
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL 17/21] block: Rename BLOCK_OP_TYPE_MIRROR to BLOCK_OP_TYPE_MIRROR_SOURCE |
Date: |
Thu, 7 Jan 2016 23:57:31 +0100 |
From: Fam Zheng <address@hidden>
It's necessary to distinguish source and target before we can add
blockdev-mirror, because we would want a concrete type of operation to
check on target bs before starting.
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 | 2 +-
hw/block/dataplane/virtio-blk.c | 2 +-
include/block/block.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 64dbfeb..bd6f68e 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3368,7 +3368,7 @@ void qmp_drive_mirror(const char *device, const char
*target,
format = mode == NEW_IMAGE_MODE_EXISTING ? NULL : bs->drv->format_name;
}
- if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_MIRROR, errp)) {
+ if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_MIRROR_SOURCE, errp)) {
goto out;
}
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index c57f293..a2529b2 100644
--- a/hw/block/dataplane/virtio-blk.c
+++ b/hw/block/dataplane/virtio-blk.c
@@ -195,7 +195,7 @@ void virtio_blk_data_plane_create(VirtIODevice *vdev,
VirtIOBlkConf *conf,
blk_op_unblock(conf->conf.blk, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT,
s->blocker);
blk_op_unblock(conf->conf.blk, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT_DELETE,
s->blocker);
- blk_op_unblock(conf->conf.blk, BLOCK_OP_TYPE_MIRROR, s->blocker);
+ blk_op_unblock(conf->conf.blk, BLOCK_OP_TYPE_MIRROR_SOURCE, s->blocker);
blk_op_unblock(conf->conf.blk, BLOCK_OP_TYPE_STREAM, s->blocker);
blk_op_unblock(conf->conf.blk, BLOCK_OP_TYPE_REPLACE, s->blocker);
diff --git a/include/block/block.h b/include/block/block.h
index db8e096..8ea12fa 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -169,7 +169,7 @@ typedef enum BlockOpType {
BLOCK_OP_TYPE_EXTERNAL_SNAPSHOT,
BLOCK_OP_TYPE_INTERNAL_SNAPSHOT,
BLOCK_OP_TYPE_INTERNAL_SNAPSHOT_DELETE,
- BLOCK_OP_TYPE_MIRROR,
+ BLOCK_OP_TYPE_MIRROR_SOURCE,
BLOCK_OP_TYPE_RESIZE,
BLOCK_OP_TYPE_STREAM,
BLOCK_OP_TYPE_REPLACE,
--
2.6.4
- [Qemu-devel] [PULL 06/21] iotests: 019: Use TEST_IMG override instead of "mv", (continued)
- [Qemu-devel] [PULL 06/21] iotests: 019: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [Qemu-devel] [PULL 07/21] iotests: 020: Use TEST_IMG override instead of "mv", Max Reitz, 2016/01/07
- [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 <=
- [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, 2016/01/07
- [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