diff mbox

[01/30] qmp-commands: move 'add_client' doc to schema

Message ID 20160913130209.695-2-marcandre.lureau@redhat.com
State New
Headers show

Commit Message

Marc-André Lureau Sept. 13, 2016, 1:01 p.m. UTC
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 docs/qmp-commands.txt | 18 ------------------
 qapi-schema.json      |  8 ++++++++
 2 files changed, 8 insertions(+), 18 deletions(-)

Comments

Eric Blake Sept. 20, 2016, 5:47 p.m. UTC | #1
On 09/13/2016 08:01 AM, Marc-André Lureau wrote:
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  docs/qmp-commands.txt | 18 ------------------
>  qapi-schema.json      |  8 ++++++++
>  2 files changed, 8 insertions(+), 18 deletions(-)
> 
> diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt

We're trimming off more than we move; but the trimmed stuff is duplicate
once it is all in one file in one location.  I'm liking the overall
theme of the consolidation.  This series will probably conflict with
other pending changes in the tree, so we should probably get it in
sooner rather than later.

Reviewed-by: Eric Blake <eblake@redhat.com>

For the next few patches, I'll probably just do a bulk R-b unless
specific issues pop out while I read through them.
diff mbox

Patch

diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index acebeb3..2d65f24 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -1531,24 +1531,6 @@  Example:
                                                   "time": "+60" } }
 <- { "return": {} }
 
-add_client
-----------
-
-Add a graphics client
-
-Arguments:
-
-- "protocol": protocol name (json-string)
-- "fdname": file descriptor name (json-string)
-- "skipauth": whether to skip authentication (json-bool, optional)
-- "tls": whether to perform TLS (json-bool, optional)
-
-Example:
-
--> { "execute": "add_client", "arguments": { "protocol": "vnc",
-                                             "fdname": "myclient" } }
-<- { "return": {} }
-
 qmp_capabilities
 ----------------
 
diff --git a/qapi-schema.json b/qapi-schema.json
index 55f825d..f0e2d2c 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -65,6 +65,7 @@ 
 { 'enum': 'LostTickPolicy',
   'data': ['discard', 'delay', 'merge', 'slew' ] }
 
+##
 # @add_client
 #
 # Allow client connections for VNC, Spice and socket based
@@ -84,6 +85,13 @@ 
 # Returns: nothing on success.
 #
 # Since: 0.14.0
+#
+# Example:
+#
+# -> { "execute": "add_client", "arguments": { "protocol": "vnc",
+#                                              "fdname": "myclient" } }
+# <- { "return": {} }
+#
 ##
 { 'command': 'add_client',
   'data': { 'protocol': 'str', 'fdname': 'str', '*skipauth': 'bool',