[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL V2 11/26] qapi/migration.json: Rename COLO unknown mo
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL V2 11/26] qapi/migration.json: Rename COLO unknown mode to none mode. |
Date: |
Fri, 19 Oct 2018 11:22:10 +0800 |
From: Zhang Chen <address@hidden>
Suggested by Markus Armbruster rename COLO unknown mode to none mode.
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
migration/colo-failover.c | 2 +-
migration/colo.c | 2 +-
qapi/migration.json | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/migration/colo-failover.c b/migration/colo-failover.c
index 0ae0c41..4854a96 100644
--- a/migration/colo-failover.c
+++ b/migration/colo-failover.c
@@ -77,7 +77,7 @@ FailoverStatus failover_get_state(void)
void qmp_x_colo_lost_heartbeat(Error **errp)
{
- if (get_colo_mode() == COLO_MODE_UNKNOWN) {
+ if (get_colo_mode() == COLO_MODE_NONE) {
error_setg(errp, QERR_FEATURE_DISABLED, "colo");
return;
}
diff --git a/migration/colo.c b/migration/colo.c
index bd7390d..2cdd366 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -160,7 +160,7 @@ COLOMode get_colo_mode(void)
} else if (migration_incoming_in_colo_state()) {
return COLO_MODE_SECONDARY;
} else {
- return COLO_MODE_UNKNOWN;
+ return COLO_MODE_NONE;
}
}
diff --git a/qapi/migration.json b/qapi/migration.json
index 4a18209..0776e0f 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -923,18 +923,18 @@
##
# @COLOMode:
#
-# The colo mode
+# The COLO current mode.
#
-# @unknown: unknown mode
+# @none: COLO is disabled.
#
-# @primary: master side
+# @primary: COLO node in primary side.
#
-# @secondary: slave side
+# @secondary: COLO node in slave side.
#
# Since: 2.8
##
{ 'enum': 'COLOMode',
- 'data': [ 'unknown', 'primary', 'secondary'] }
+ 'data': [ 'none', 'primary', 'secondary'] }
##
# @FailoverStatus:
--
2.5.0
- [Qemu-devel] [PULL V2 01/26] filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table, (continued)
- [Qemu-devel] [PULL V2 01/26] filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 02/26] colo-compare: implement the process of checkpoint, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 04/26] COLO: integrate colo compare with colo frame, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 03/26] colo-compare: use notifier to notify packets comparing result, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 05/26] COLO: Add block replication into colo process, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 07/26] COLO: Load dirty pages into SVM's RAM cache firstly, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 06/26] COLO: Remove colo_state migration struct, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 08/26] ram/COLO: Record the dirty pages that SVM received, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 09/26] COLO: Flush memory data from ram cache, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 10/26] qmp event: Add COLO_EXIT event to notify users while exited COLO, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 11/26] qapi/migration.json: Rename COLO unknown mode to none mode.,
Jason Wang <=
- [Qemu-devel] [PULL V2 12/26] qapi: Add new command to query colo status, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 14/26] COLO: flush host dirty ram from cache, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 13/26] savevm: split the process of different stages for loadvm/savevm, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 15/26] filter: Add handle_event method for NetFilterClass, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 17/26] COLO: notify net filters about checkpoint/failover event, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 19/26] docs: Add COLO status diagram to COLO-FT.txt, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 20/26] clean up callback when del virtqueue, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 18/26] COLO: quick failover process by kick COLO thread, Jason Wang, 2018/10/18
- [Qemu-devel] [PULL V2 22/26] rtl8139: fix possible out of bound access, Jason Wang, 2018/10/18