Skip to content

Commit 3da7a41

Browse files
committed
watchdog: Consolidate QAPI into single file
Commit f0df84c 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 0e201d3 creating the latter file, even though it was merged after. Signed-off-by: Eric Blake <[email protected]> Message-Id: <[email protected]>
1 parent f9c1463 commit 3da7a41

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Diff for: qapi-schema.json

-9
Original file line numberDiff line numberDiff line change
@@ -3291,12 +3291,3 @@
32913291
# Since: 2.9
32923292
##
32933293
{ 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' }
3294-
3295-
##
3296-
# @watchdog-set-action:
3297-
#
3298-
# Set watchdog action
3299-
#
3300-
# Since: 2.11
3301-
##
3302-
{ 'command': 'watchdog-set-action', 'data' : {'action': 'WatchdogAction'} }

Diff for: qapi/run-state.json

+9
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,15 @@
283283
'data': [ 'reset', 'shutdown', 'poweroff', 'pause', 'debug', 'none',
284284
'inject-nmi' ] }
285285

286+
##
287+
# @watchdog-set-action:
288+
#
289+
# Set watchdog action
290+
#
291+
# Since: 2.11
292+
##
293+
{ 'command': 'watchdog-set-action', 'data' : {'action': 'WatchdogAction'} }
294+
286295
##
287296
# @GUEST_PANICKED:
288297
#

0 commit comments

Comments
 (0)