proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-06 20:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Anthony Liguori 2012-03-12 20:48:00 -05:00
commit 1d2cb1a2d8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qapi-schema.json
View File

@ -616,11 +616,12 @@
# @connection-id: SPICE connection id number. All channels with the same id # @connection-id: SPICE connection id number. All channels with the same id
# belong to the same SPICE session. # belong to the same SPICE session.
# #
# @connection-type: SPICE channel type number. "1" is the main control channel, # @connection-type: SPICE channel type number. "1" is the main control
# filter for this one if you want track spice sessions only # 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 # @channel-id: SPICE channel ID number. Usually "0", might be different when
# when multiple channels of the same type exist, such as multiple # multiple channels of the same type exist, such as multiple
# display channels in a multihead setup # display channels in a multihead setup
# #
# @tls: true if the channel is encrypted, false otherwise. # @tls: true if the channel is encrypted, false otherwise.
@ -649,8 +650,9 @@
# @tls-port: #optional The SPICE server's TLS port number. # @tls-port: #optional The SPICE server's TLS port number.
# #
# @auth: #optional the current authentication type used by the server # @auth: #optional the current authentication type used by the server
# 'none' if no authentication is being used # '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 # @channels: a list of @SpiceChannel for each active spice channel
# #
@ -1254,7 +1256,7 @@
{ 'command': 'migrate_set_speed', 'data': {'value': 'int'} } { 'command': 'migrate_set_speed', 'data': {'value': 'int'} }
## ##
# @DevicePropertyInfo: # @ObjectPropertyInfo:
# #
# @name: the name of the property # @name: the name of the property
# #

1
qjson.h
View File

@ -15,6 +15,7 @@
#define QJSON_H #define QJSON_H
#include <stdarg.h> #include <stdarg.h>
#include "compiler.h"
#include "qobject.h" #include "qobject.h"
#include "qstring.h" #include "qstring.h"