| Message ID | 1330953208-25147-1-git-send-email-alevy@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 5 Mar 2012 15:13:27 +0200 Alon Levy <alevy@redhat.com> wrote: > Signed-off-by: Alon Levy <alevy@redhat.com> Applied both patches to the qmp branch, thanks. > --- > qapi-schema.json | 14 ++++++++------ > 1 files changed, 8 insertions(+), 6 deletions(-) > > v1->v2: > - Fixes wrong indentation for second spice channel-id > - split the last part (ObjectPropertyInfo). > > diff --git a/qapi-schema.json b/qapi-schema.json > index 5f293c4..93ee2a4 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 > #
diff --git a/qapi-schema.json b/qapi-schema.json index 5f293c4..93ee2a4 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 #
Signed-off-by: Alon Levy <alevy@redhat.com> --- qapi-schema.json | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) v1->v2: - Fixes wrong indentation for second spice channel-id - split the last part (ObjectPropertyInfo).