Commit 1d2cb1a2 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'qmp/queue/qmp' into staging 

* qmp/queue/qmp:
  qapi-schema.json: fix comment for type ObjectPropretyInfo
  qapi-schema: fix typos and explain 'spice' auth
  qjson.h: include compiler.h for GCC_FMT_ATTR
parents 8d9dde94 d03ee401

qapi-schema.json

+9 −7
Original line number Diff line number Diff line
@@ -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.
@@ -650,7 +651,8 @@ 
#

# @auth: #optional the current authentication type used by the server

#        'none'  if no authentication is being used

#        'spice' (TODO: describe)

#        'spice' uses SASL or direct TLS authentication, depending on command

#                line options

#

# @channels: a list of @SpiceChannel for each active spice channel

#
@@ -1254,7 +1256,7 @@ 
{ 'command': 'migrate_set_speed', 'data': {'value': 'int'} }



##

# @DevicePropertyInfo:

# @ObjectPropertyInfo:

#

# @name: the name of the property

#

qjson.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#define QJSON_H



#include <stdarg.h>

#include "compiler.h"

#include "qobject.h"

#include "qstring.h"