From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 23 Jun 2016 13:10:40 +0000 (+0200)
Subject: qmp-commands: move 'query-commands' doc to schema
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8b0ffce442b9dbfaac65aa4eccdc4cdf5dc0203b;p=qmiga%2Fqemu.git

qmp-commands: move 'query-commands' doc to schema

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---

diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index cb41253592..0e0416e3ba 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -209,34 +209,6 @@ Note: This command must be issued before issuing any other command.
 =================
 
 
-query-commands
---------------
-
-List QMP available commands.
-
-Each command is represented by a json-object, the returned value is a json-array
-of all commands.
-
-Each json-object contain:
-
-- "name": command's name (json-string)
-
-Example:
-
--> { "execute": "query-commands" }
-<- {
-      "return":[
-         {
-            "name":"query-balloon"
-         },
-         {
-            "name":"system_powerdown"
-         }
-      ]
-   }
-
-Note: This example has been shortened as the real response is too long.
-
 query-qmp-schema
 ----------------
 
diff --git a/qapi/common.json b/qapi/common.json
index d6a6d76176..b626647b2f 100644
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -114,6 +114,23 @@
 # Returns: A list of @CommandInfo for all supported commands
 #
 # Since: 0.14.0
+#
+# Example:
+#
+# -> { "execute": "query-commands" }
+# <- {
+#      "return":[
+#         {
+#            "name":"query-balloon"
+#         },
+#         {
+#            "name":"system_powerdown"
+#         }
+#      ]
+#    }
+#
+# Note: This example has been shortened as the real response is too long.
+#
 ##
 { 'command': 'query-commands', 'returns': ['CommandInfo'] }