From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 23 Jun 2016 11:45:12 +0000 (+0200)
Subject: qmp-commands: move 'query-tpm' doc to schema
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4e022d01ee17cbc5653db51108832fe938a9c6da;p=qemu.git

qmp-commands: move 'query-tpm' 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 c613ab45f5..3afb4389a7 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -1203,31 +1203,6 @@ Example:
      ]
    }
 
-query-tpm
----------
-
-Return information about the TPM device.
-
-Arguments: None
-
-Example:
-
--> { "execute": "query-tpm" }
-<- { "return":
-     [
-       { "model": "tpm-tis",
-         "options":
-           { "type": "passthrough",
-             "data":
-               { "cancel-path": "/sys/class/misc/tpm0/device/cancel",
-                 "path": "/dev/tpm0"
-               }
-           },
-         "id": "tpm0"
-       }
-     ]
-   }
-
 query-rx-filter
 ---------------
 
diff --git a/qapi-schema.json b/qapi-schema.json
index 68a841882d..782d802bad 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -4991,6 +4991,25 @@
 # Returns: @TPMInfo on success
 #
 # Since: 1.5
+#
+# Example:
+#
+# -> { "execute": "query-tpm" }
+# <- { "return":
+#      [
+#        { "model": "tpm-tis",
+#          "options":
+#            { "type": "passthrough",
+#              "data":
+#                { "cancel-path": "/sys/class/misc/tpm0/device/cancel",
+#                  "path": "/dev/tpm0"
+#                }
+#            },
+#          "id": "tpm0"
+#        }
+#      ]
+#    }
+#
 ##
 { 'command': 'query-tpm', 'returns': ['TPMInfo'] }