Re: [Qemu-devel] [PATCH V9 11/20] qapi/migration.json: Rename COLO unknown mode to none mode.

[Markus Armbruster]

Zhang Chen <address@hidden> writes:

> From: Zhang Chen <address@hidden>
>
> Suggested by Markus Armbruster rename COLO unknown mode to none mode.
>
> Signed-off-by: Zhang Chen <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 ab484ad754..8fdb79ac73 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 d8c3b2e443..c24f114104 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -864,18 +864,18 @@
>  ##
>  # @COLOMode:
>  #
> -# The colo mode
> +# The COLO current mode.
>  #
> -# @unknown: unknown mode
> +# @none: None mode.

This could use a bit of polish.  Perhaps:

   # @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:

Preferably with the comment improved:
Reviewed-by: Markus Armbruster <address@hidden>