[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/25] qapi/migration.json: Rename COLO unknown mode
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 11/25] qapi/migration.json: Rename COLO unknown mode to none mode. |
Date: |
Wed, 26 Sep 2018 11:16:36 +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 0ae0c41221..4854a96c92 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 bd7390d6aa..2cdd366276 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 9b3b1c0c4e..c0bc77fd8d 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -899,18 +899,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.17.1
- [Qemu-devel] [PULL 23/25] pcnet: fix possible buffer overflow, (continued)
- [Qemu-devel] [PULL 23/25] pcnet: fix possible buffer overflow, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 22/25] rtl8139: fix possible out of bound access, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 19/25] docs: Add COLO status diagram to COLO-FT.txt, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 20/25] clean up callback when del virtqueue, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 14/25] COLO: flush host dirty ram from cache, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 21/25] ne2000: fix possible out of bound access in ne2000_receive, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 17/25] COLO: notify net filters about checkpoint/failover event, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 18/25] COLO: quick failover process by kick COLO thread, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 13/25] savevm: split the process of different stages for loadvm/savevm, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 15/25] filter: Add handle_event method for NetFilterClass, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 11/25] qapi/migration.json: Rename COLO unknown mode to none mode.,
Jason Wang <=
- [Qemu-devel] [PULL 05/25] COLO: Add block replication into colo process, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 07/25] COLO: Load dirty pages into SVM's RAM cache firstly, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 16/25] filter-rewriter: handle checkpoint and failover event, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 12/25] qapi: Add new command to query colo status, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 10/25] qmp event: Add COLO_EXIT event to notify users while exited COLO, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 09/25] COLO: Flush memory data from ram cache, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 08/25] ram/COLO: Record the dirty pages that SVM received, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 01/25] filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 04/25] COLO: integrate colo compare with colo frame, Jason Wang, 2018/09/25
- [Qemu-devel] [PULL 03/25] colo-compare: use notifier to notify packets comparing result, Jason Wang, 2018/09/25