diff options
author | Eric Blake | 2018-02-26 23:57:43 +0100 |
---|---|---|
committer | Eric Blake | 2018-03-02 20:14:10 +0100 |
commit | 3da7a4161a96d7539588729042e987f4c6fd97c6 (patch) | |
tree | 20b758648b9fe7f85fa958b136e715178218e954 | |
parent | qapi/common: Fix guardname() for funny filenames (diff) | |
download | qemu-3da7a4161a96d7539588729042e987f4c6fd97c6.tar.gz qemu-3da7a4161a96d7539588729042e987f4c6fd97c6.tar.xz qemu-3da7a4161a96d7539588729042e987f4c6fd97c6.zip |
watchdog: Consolidate QAPI into single file
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. The command was written prior to commit 0e201d34
creating the latter file, even though it was merged after.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180226225744.26356-1-eblake@redhat.com>
-rw-r--r-- | qapi-schema.json | 9 | ||||
-rw-r--r-- | qapi/run-state.json | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index d214529547..3c1abf2700 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3291,12 +3291,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 92d29fd571..1c9fff3aef 100644 --- a/qapi/run-state.json +++ b/qapi/run-state.json @@ -284,6 +284,15 @@ 'inject-nmi' ] } ## +# @watchdog-set-action: +# +# Set watchdog action +# +# Since: 2.11 +## +{ 'command': 'watchdog-set-action', 'data' : {'action': 'WatchdogAction'} } + +## # @GUEST_PANICKED: # # Emitted when guest OS panic is detected |