From 156b12d73983aa3c75ee1a82d5343787bb48e579 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Fri, 24 Feb 2012 23:22:03 +0200 Subject: [PATCH 1/3] qjson.h: include compiler.h for GCC_FMT_ATTR Signed-off-by: Alon Levy Signed-off-by: Luiz Capitulino --- qjson.h | 1 + 1 file changed, 1 insertion(+) diff --git a/qjson.h b/qjson.h index 65b10ea369..1190d8a86c 100644 --- a/qjson.h +++ b/qjson.h @@ -15,6 +15,7 @@ #define QJSON_H #include +#include "compiler.h" #include "qobject.h" #include "qstring.h" From 419e1bdfefecdb161d7a78c7b7da1e70074bd61a Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Mon, 5 Mar 2012 15:13:27 +0200 Subject: [PATCH 2/3] qapi-schema: fix typos and explain 'spice' auth Signed-off-by: Alon Levy Signed-off-by: Luiz Capitulino --- qapi-schema.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 5f293c4403..93ee2a4a93 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -616,11 +616,12 @@ # @connection-id: SPICE connection id number. All channels with the same id # belong to the same SPICE session. # -# @connection-type: SPICE channel type number. "1" is the main control channel, -# filter for this one if you want track spice sessions only +# @connection-type: SPICE channel type number. "1" is the main control +# channel, filter for this one if you want to track spice +# sessions only # -# @channel-id: SPICE channel ID number. Usually "0", might be different needed -# when multiple channels of the same type exist, such as multiple +# @channel-id: SPICE channel ID number. Usually "0", might be different when +# multiple channels of the same type exist, such as multiple # display channels in a multihead setup # # @tls: true if the channel is encrypted, false otherwise. @@ -649,8 +650,9 @@ # @tls-port: #optional The SPICE server's TLS port number. # # @auth: #optional the current authentication type used by the server -# 'none' if no authentication is being used -# 'spice' (TODO: describe) +# 'none' if no authentication is being used +# 'spice' uses SASL or direct TLS authentication, depending on command +# line options # # @channels: a list of @SpiceChannel for each active spice channel # From d03ee40185ae8f6d6993ef58f96e0eb956f3cc33 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Mon, 5 Mar 2012 15:13:28 +0200 Subject: [PATCH 3/3] qapi-schema.json: fix comment for type ObjectPropretyInfo Signed-off-by: Alon Levy Signed-off-by: Luiz Capitulino --- qapi-schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi-schema.json b/qapi-schema.json index 93ee2a4a93..dd9e0e5434 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1256,7 +1256,7 @@ { 'command': 'migrate_set_speed', 'data': {'value': 'int'} } ## -# @DevicePropertyInfo: +# @ObjectPropertyInfo: # # @name: the name of the property #