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]>
n64decomp · Mar 2, 2018 · 3da7a41 · 3da7a41
1 parent f9c1463
commit 3da7a41
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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:
 #