On 01/04/2018 12:01 AM, Zhang Chen wrote: > From: zhanghailiang <zhang.zhanghaili...@huawei.com> > > If some errors happen during VM's COLO FT stage, it's important to > notify the users of this event. Together with 'x_colo_lost_heartbeat',
Isn't that spelled x-colo-lost-heartbeat in QMP?
> Users can intervene in COLO's failover work immediately.
> If users don't want to get involved in COLO's failover verdict,
> it is still necessary to notify users that we exited COLO mode.
>
> Cc: Markus Armbruster <arm...@redhat.com>
> Cc: Michael Roth <mdr...@linux.vnet.ibm.com>
> Signed-off-by: zhanghailiang <zhang.zhanghaili...@huawei.com>
> Signed-off-by: Li Zhijian <lizhij...@cn.fujitsu.com>
> Signed-off-by: Zhang Chen <zhangc...@gmail.com>
> Reviewed-by: Eric Blake <ebl...@redhat.com>
> ---
Focusing on just the UI:
> +++ b/qapi-schema.json
> @@ -2921,6 +2921,27 @@
> { 'command': 'query-acpi-ospm-status', 'returns': ['ACPIOSTInfo'] }
>
> ##
> +# @COLO_EXIT:
> +#
> +# Emitted when VM finishes COLO mode due to some errors happening or
> +# at the request of users.
> +#
> +# @mode: which COLO mode the VM was in when it exited.
> +#
> +# @reason: describes the reason for the COLO exit.
> +#
> +# Since: 2.11
You've missed 2.11; this should be 2.12.
> +#
> +# Example:
> +#
> +# <- { "timestamp": {"seconds": 2032141960, "microseconds": 417172},
> +# "event": "COLO_EXIT", "data": {"mode": "primary", "reason": "request"
> } }
> +#
> +##
> +{ 'event': 'COLO_EXIT',
> + 'data': {'mode': 'COLOMode', 'reason': 'COLOExitReason' } }
Since COLOMode is in migration.json, shouldn't this 'event' declaration
live there as well?
> +
> +##
> # @ACPI_DEVICE_OST:
> #
> # Emitted when guest executes ACPI _OST method.
> diff --git a/qapi/migration.json b/qapi/migration.json
> index 03f57c9..f7b2cc6 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -854,6 +854,19 @@
> ##
> { 'enum': 'FailoverStatus',
> 'data': [ 'none', 'require', 'active', 'completed', 'relaunch' ] }
> +##
> +# @COLOExitReason:
> +#
> +# The reason for a COLO exit
> +#
> +# @request: COLO exit is due to an external request
> +#
> +# @error: COLO exit is due to an internal error
> +#
> +# Since: 2.11
2.12
> +##
> +{ 'enum': 'COLOExitReason',
> + 'data': [ 'request', 'error' ] }
>
> ##
> # @x-colo-lost-heartbeat:
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
