mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi/migration.json: Rename COLO unknown mode to none mode.

Browse Source 
Suggested by Markus Armbruster rename COLO unknown mode to none mode.

Signed-off-by: Zhang Chen <zhangckid@gmail.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Zhang Chen 2018-09-03 12:38:52 +08:00 committed by Jason Wang
parent 9ecff6d66e
commit 41b6b77921
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migration/colo-failover.c
View File

@ -77,7 +77,7 @@ FailoverStatus failover_get_state(void)
void qmp_x_colo_lost_heartbeat(Error **errp) 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"); error_setg(errp, QERR_FEATURE_DISABLED, "colo");
return; return;
} }

2
migration/colo.c
View File

@ -160,7 +160,7 @@ COLOMode get_colo_mode(void)
} else if (migration_incoming_in_colo_state()) { } else if (migration_incoming_in_colo_state()) {
return COLO_MODE_SECONDARY; return COLO_MODE_SECONDARY;
} else { } else {
return COLO_MODE_UNKNOWN; return COLO_MODE_NONE;
} }
} }

10
qapi/migration.json
View File

@ -923,18 +923,18 @@
## ##
# @COLOMode: # @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 # Since: 2.8
## ##
{ 'enum': 'COLOMode', { 'enum': 'COLOMode',
'data': [ 'unknown', 'primary', 'secondary'] } 'data': [ 'none', 'primary', 'secondary'] }
## ##
# @FailoverStatus: # @FailoverStatus: