[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/30] qmp-commands: move 'query-spice' doc to schem
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 22/30] qmp-commands: move 'query-spice' doc to schema |
Date: |
Tue, 13 Sep 2016 17:02:01 +0400 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
docs/qmp-commands.txt | 67 ---------------------------------------------------
qapi-schema.json | 42 ++++++++++++++++++++++++++++----
2 files changed, 37 insertions(+), 72 deletions(-)
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index ca75716..3b7af3b 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -2137,73 +2137,6 @@ Example:
Note: This example has been shortened as the real response is too long.
-query-spice
------------
-
-Show SPICE server information.
-
-Return a json-object with server information. Connected clients are returned
-as a json-array of json-objects.
-
-The main json-object contains the following:
-
-- "enabled": true or false (json-bool)
-- "host": server's IP address (json-string)
-- "port": server's port number (json-int, optional)
-- "tls-port": server's port number (json-int, optional)
-- "auth": authentication method (json-string)
- - Possible values: "none", "spice"
-- "channels": a json-array of all active channels clients
-
-Channels are described by a json-object, each one contain the following:
-
-- "host": client's IP address (json-string)
-- "family": address family (json-string)
- - Possible values: "ipv4", "ipv6", "unix", "unknown"
-- "port": client's port number (json-string)
-- "connection-id": spice connection id. All channels with the same id
- belong to the same spice session (json-int)
-- "channel-type": channel type. "1" is the main control channel, filter for
- this one if you want track spice sessions only (json-int)
-- "channel-id": channel id. Usually "0", might be different needed when
- multiple channels of the same type exist, such as multiple
- display channels in a multihead setup (json-int)
-- "tls": whether the channel is encrypted (json-bool)
-
-Example:
-
--> { "execute": "query-spice" }
-<- {
- "return": {
- "enabled": true,
- "auth": "spice",
- "port": 5920,
- "tls-port": 5921,
- "host": "0.0.0.0",
- "channels": [
- {
- "port": "54924",
- "family": "ipv4",
- "channel-type": 1,
- "connection-id": 1804289383,
- "host": "127.0.0.1",
- "channel-id": 0,
- "tls": true
- },
- {
- "port": "36710",
- "family": "ipv4",
- "channel-type": 4,
- "connection-id": 1804289383,
- "host": "127.0.0.1",
- "channel-id": 0,
- "tls": false
- },
- [ ... more channels follow ... ]
- ]
- }
- }
-
query-command-line-options
--------------------------
diff --git a/qapi-schema.json b/qapi-schema.json
index f169b08..389eb9a 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1616,7 +1616,7 @@
# @enabled: true if the SPICE server is enabled, false otherwise
#
# @migrated: true if the last guest migration completed and spice
-# migration had completed as well. false otherwise.
+# migration had completed as well. false otherwise. (since 1.4)
#
# @host: #optional The hostname the SPICE server is bound to. This depends on
# the name resolution on the host and may be an IP address.
@@ -1634,9 +1634,7 @@
#
# @mouse-mode: The mode in which the mouse cursor is displayed currently. Can
# be determined by the client or the server, or unknown if spice
-# server doesn't provide this information.
-#
-# Since: 1.1
+# server doesn't provide this information. (since: 1.1)
#
# @channels: a list of @SpiceChannel for each active spice channel
#
@@ -1650,11 +1648,45 @@
##
# @query-spice
#
-# Returns information about the current SPICE server
+# Returns information about the current SPICE server.
#
# Returns: @SpiceInfo
#
# Since: 0.14.0
+#
+# Example:
+#
+# -> { "execute": "query-spice" }
+# <- { "return": {
+# "enabled": true,
+# "auth": "spice",
+# "port": 5920,
+# "tls-port": 5921,
+# "host": "0.0.0.0",
+# "channels": [
+# {
+# "port": "54924",
+# "family": "ipv4",
+# "channel-type": 1,
+# "connection-id": 1804289383,
+# "host": "127.0.0.1",
+# "channel-id": 0,
+# "tls": true
+# },
+# {
+# "port": "36710",
+# "family": "ipv4",
+# "channel-type": 4,
+# "connection-id": 1804289383,
+# "host": "127.0.0.1",
+# "channel-id": 0,
+# "tls": false
+# },
+# [ ... more channels follow ... ]
+# ]
+# }
+# }
+#
##
{ 'command': 'query-spice', 'returns': 'SpiceInfo' }
--
2.10.0
- [Qemu-devel] [PATCH 14/30] qmp-commands: move 'migrate-set-parameters' doc to schema, (continued)
- [Qemu-devel] [PATCH 14/30] qmp-commands: move 'migrate-set-parameters' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 15/30] qmp-commands: move 'query-migrate-parameters' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 16/30] qmp-commands: move 'client_migrate_info' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 17/30] qmp-commands: move 'migrate-start-postcopy' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 18/30] qmp-commands: move 'query-mice' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 19/30] qmp-commands: move 'query-cpus' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 20/30] qmp-commands: move 'query-iothreads' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 23/30] qmp-commands: move 'query-balloon' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 21/30] qmp-commands: move 'query-vnc' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 22/30] qmp-commands: move 'query-spice' doc to schema,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 25/30] qmp-commands: move 'quit' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 24/30] qmp-commands: move 'query-pci' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 27/30] qmp-commands: move 'system_reset' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 26/30] qmp-commands: move 'stop' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 28/30] qmp-commands: move 'system_powerdown' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 29/30] qmp-commands: move 'cpu-add' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 30/30] qmp-commands: move 'memsave' doc to schema, Marc-André Lureau, 2016/09/13
- Re: [Qemu-devel] [PATCH 00/30] Move qapi documentation to schema (part 1/5), Markus Armbruster, 2016/09/13