[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/16] Add new block driver interfaces to control bl
From: |
Wen Congyang |
Subject: |
[Qemu-devel] [PATCH 11/16] Add new block driver interfaces to control block replication |
Date: |
Wed, 2 Sep 2015 16:51:15 +0800 |
Signed-off-by: Wen Congyang <address@hidden>
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Cc: Luiz Capitulino <address@hidden>
Cc: Michael Roth <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
block.c | 43 +++++++++++++++++++++++++++++++++++++++++++
include/block/block.h | 5 +++++
include/block/block_int.h | 14 ++++++++++++++
qapi/block-core.json | 15 +++++++++++++++
4 files changed, 77 insertions(+)
diff --git a/block.c b/block.c
index 5119e1e..c7670d2 100644
--- a/block.c
+++ b/block.c
@@ -4390,3 +4390,46 @@ void bdrv_del_child(BlockDriverState *bs,
BlockDriverState *child_bs,
bs->drv->bdrv_del_child(bs, child_bs, errp);
}
+
+void bdrv_start_replication(BlockDriverState *bs, ReplicationMode mode,
+ Error **errp)
+{
+ BlockDriver *drv = bs->drv;
+
+ if (drv && drv->bdrv_start_replication) {
+ drv->bdrv_start_replication(bs, mode, errp);
+ } else if (bs->file) {
+ bdrv_start_replication(bs->file, mode, errp);
+ } else {
+ error_setg(errp, "The BDS %s doesn't support starting block"
+ " replication", bs->filename);
+ }
+}
+
+void bdrv_do_checkpoint(BlockDriverState *bs, Error **errp)
+{
+ BlockDriver *drv = bs->drv;
+
+ if (drv && drv->bdrv_do_checkpoint) {
+ drv->bdrv_do_checkpoint(bs, errp);
+ } else if (bs->file) {
+ bdrv_do_checkpoint(bs->file, errp);
+ } else {
+ error_setg(errp, "The BDS %s doesn't support block checkpoint",
+ bs->filename);
+ }
+}
+
+void bdrv_stop_replication(BlockDriverState *bs, bool failover, Error **errp)
+{
+ BlockDriver *drv = bs->drv;
+
+ if (drv && drv->bdrv_stop_replication) {
+ drv->bdrv_stop_replication(bs, failover, errp);
+ } else if (bs->file) {
+ bdrv_stop_replication(bs->file, failover, errp);
+ } else {
+ error_setg(errp, "The BDS %s doesn't support stopping block"
+ " replication", bs->filename);
+ }
+}
diff --git a/include/block/block.h b/include/block/block.h
index 98c8509..192a066 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -626,4 +626,9 @@ void bdrv_add_child(BlockDriverState *bs, QDict *options,
Error **errp);
void bdrv_del_child(BlockDriverState *bs, BlockDriverState *child,
Error **errp);
+void bdrv_start_replication(BlockDriverState *bs, ReplicationMode mode,
+ Error **errp);
+void bdrv_do_checkpoint(BlockDriverState *bs, Error **errp);
+void bdrv_stop_replication(BlockDriverState *bs, bool failover, Error **errp);
+
#endif
diff --git a/include/block/block_int.h b/include/block/block_int.h
index b6f2905..1c2d310 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -293,6 +293,20 @@ struct BlockDriver {
void (*bdrv_del_child)(BlockDriverState *bs, BlockDriverState *child,
Error **errp);
+ void (*bdrv_start_replication)(BlockDriverState *bs, ReplicationMode mode,
+ Error **errp);
+ /* Drop Disk buffer when doing checkpoint. */
+ void (*bdrv_do_checkpoint)(BlockDriverState *bs, Error **errp);
+ /*
+ * After failover, we should flush Disk buffer into secondary disk
+ * and stop block replication.
+ *
+ * If the guest is shutdown, we should drop Disk buffer and stop
+ * block representation.
+ */
+ void (*bdrv_stop_replication)(BlockDriverState *bs, bool failover,
+ Error **errp);
+
QLIST_ENTRY(BlockDriver) list;
};
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 24099ef..96f0530 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1810,6 +1810,21 @@
'data': { '*export': 'str' } }
##
+# @ReplicationMode
+#
+# An enumeration of replication modes.
+#
+# @unprotected: Replication is not started or after failover.
+#
+# @primary: Primary mode, the vm's state will be sent to secondary QEMU.
+#
+# @secondary: Secondary mode, receive the vm's state from primary QEMU.
+#
+# Since: 2.4
+##
+{ 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ] }
+
+##
# @BlockdevOptions
#
# Options for creating a block device.
--
2.4.3
- Re: [Qemu-devel] [PATCH 06/16] quorum: allow ignoring child errors, (continued)
[Qemu-devel] [PATCH 09/16] Allow creating backup jobs when opening BDS, Wen Congyang, 2015/09/02
[Qemu-devel] [PATCH 05/16] introduce a new API qemu_opts_absorb_qdict_by_index(), Wen Congyang, 2015/09/02
[Qemu-devel] [PATCH 08/16] block: make bdrv_put_ref_bh_schedule() as a public API, Wen Congyang, 2015/09/02
[Qemu-devel] [PATCH 11/16] Add new block driver interfaces to control block replication,
Wen Congyang <=
[Qemu-devel] [PATCH 12/16] skip nbd_target when starting block replication, Wen Congyang, 2015/09/02
[Qemu-devel] [PATCH 13/16] quorum: implement block driver interfaces for block replication, Wen Congyang, 2015/09/02
[Qemu-devel] [PATCH 10/16] docs: block replication's description, Wen Congyang, 2015/09/02
[Qemu-devel] [PATCH 15/16] support replication driver in blockdev-add, Wen Congyang, 2015/09/02