Re: [Qemu-devel] [PATCH v2 23.5/29] watchdog: Consolidate QAPI into single file

[Eric Blake]

On 02/26/2018 04:57 PM, Eric Blake wrote:
> Commit f0df84c6 added watchdog-set-action in the main qapi-schema.json,
> but it belongs better in qapi/run-state.json alongside the definition
> of WatchdogAction.

I'm adding:

The command was written prior to commit 0e201d34 creating the latter 
file, even though it was merged after.

> Signed-off-by: Eric Blake <address@hidden>
> ---
>
> Based on my review of 24/29, I'm inserting this patch right before
> rebasing that one onto master.
>
>   qapi-schema.json    | 9 ---------
>   qapi/run-state.json | 9 +++++++++
>   2 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 05cc58e121e..93912e804ab 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -3180,12 +3180,3 @@
>   # Since: 2.9
>   ##
>   { 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' }
> -
> -##
> -# @watchdog-set-action:
> -#
> -# Set watchdog action
> -#
> -# Since: 2.11
> -##
> -{ 'command': 'watchdog-set-action', 'data' : {'action': 'WatchdogAction'} }
> diff --git a/qapi/run-state.json b/qapi/run-state.json
> index bca46a8785f..3924357fef4 100644
> --- a/qapi/run-state.json
> +++ b/qapi/run-state.json
> @@ -283,6 +283,15 @@
>     'data': [ 'reset', 'shutdown', 'poweroff', 'pause', 'debug', 'none',
>               'inject-nmi' ] }
>
> +##
> +# @watchdog-set-action:
> +#
> +# Set watchdog action
> +#
> +# Since: 2.11
> +##
> +{ 'command': 'watchdog-set-action', 'data' : {'action': 'WatchdogAction'} }
> +
>   ##
>   # @GUEST_PANICKED:
>   #

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org