2017-08-24 21:14:00 +02:00
|
|
|
# -*- Mode: Python -*-
|
2020-07-29 20:50:24 +02:00
|
|
|
# vim: filetype=python
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
|
|
|
|
##
|
|
|
|
# = Remote desktop
|
|
|
|
##
|
|
|
|
|
2020-10-20 12:47:58 +02:00
|
|
|
{ 'include': 'common.json' }
|
2017-08-24 21:14:00 +02:00
|
|
|
{ 'include': 'sockets.json' }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @set_password:
|
|
|
|
#
|
|
|
|
# Sets the password of a remote display session.
|
|
|
|
#
|
2020-02-13 18:56:30 +01:00
|
|
|
# @protocol: - 'vnc' to modify the VNC server password
|
|
|
|
# - 'spice' to modify the Spice server password
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# @password: the new password
|
|
|
|
#
|
|
|
|
# @connected: how to handle existing clients when changing the
|
2020-02-13 18:56:29 +01:00
|
|
|
# password. If nothing is specified, defaults to 'keep'
|
|
|
|
# 'fail' to fail the command if clients are connected
|
|
|
|
# 'disconnect' to disconnect existing clients
|
|
|
|
# 'keep' to maintain existing clients
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
2020-02-13 18:56:30 +01:00
|
|
|
# Returns: - Nothing on success
|
|
|
|
# - If Spice is not enabled, DeviceNotFound
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# -> { "execute": "set_password", "arguments": { "protocol": "vnc",
|
|
|
|
# "password": "secret" } }
|
|
|
|
# <- { "return": {} }
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'command': 'set_password',
|
|
|
|
'data': {'protocol': 'str', 'password': 'str', '*connected': 'str'} }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @expire_password:
|
|
|
|
#
|
|
|
|
# Expire the password of a remote display server.
|
|
|
|
#
|
2020-02-13 18:56:29 +01:00
|
|
|
# @protocol: the name of the remote display protocol 'vnc' or 'spice'
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# @time: when to expire the password.
|
|
|
|
#
|
2020-02-13 18:56:30 +01:00
|
|
|
# - 'now' to expire the password immediately
|
|
|
|
# - 'never' to cancel password expiration
|
|
|
|
# - '+INT' where INT is the number of seconds from now (integer)
|
|
|
|
# - 'INT' where INT is the absolute time in seconds
|
|
|
|
#
|
|
|
|
# Returns: - Nothing on success
|
|
|
|
# - If @protocol is 'spice' and Spice is not active, DeviceNotFound
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Notes: Time is relative to the server and currently there is no way to
|
|
|
|
# coordinate server time with client time. It is not recommended to
|
|
|
|
# use the absolute time version of the @time parameter unless you're
|
|
|
|
# sure you are on the same machine as the QEMU instance.
|
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# -> { "execute": "expire_password", "arguments": { "protocol": "vnc",
|
|
|
|
# "time": "+60" } }
|
|
|
|
# <- { "return": {} }
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'command': 'expire_password', 'data': {'protocol': 'str', 'time': 'str'} }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @screendump:
|
|
|
|
#
|
|
|
|
# Write a PPM of the VGA screen to a file.
|
|
|
|
#
|
|
|
|
# @filename: the path of a new PPM file to store the image
|
|
|
|
#
|
2018-03-05 17:37:48 +01:00
|
|
|
# @device: ID of the display device that should be dumped. If this parameter
|
|
|
|
# is missing, the primary display will be used. (Since 2.12)
|
|
|
|
#
|
|
|
|
# @head: head to use in case the device supports multiple heads. If this
|
|
|
|
# parameter is missing, head #0 will be used. Also note that the head
|
|
|
|
# can only be specified in conjunction with the device ID. (Since 2.12)
|
|
|
|
#
|
2017-08-24 21:14:00 +02:00
|
|
|
# Returns: Nothing on success
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# -> { "execute": "screendump",
|
|
|
|
# "arguments": { "filename": "/tmp/image" } }
|
|
|
|
# <- { "return": {} }
|
|
|
|
#
|
|
|
|
##
|
2018-03-05 17:37:48 +01:00
|
|
|
{ 'command': 'screendump',
|
2020-10-27 14:36:02 +01:00
|
|
|
'data': {'filename': 'str', '*device': 'str', '*head': 'int'},
|
|
|
|
'coroutine': true }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# == Spice
|
|
|
|
##
|
|
|
|
|
|
|
|
##
|
|
|
|
# @SpiceBasicInfo:
|
|
|
|
#
|
|
|
|
# The basic information for SPICE network connection
|
|
|
|
#
|
|
|
|
# @host: IP address
|
|
|
|
#
|
|
|
|
# @port: port number
|
|
|
|
#
|
|
|
|
# @family: address family
|
|
|
|
#
|
|
|
|
# Since: 2.1
|
|
|
|
##
|
|
|
|
{ 'struct': 'SpiceBasicInfo',
|
|
|
|
'data': { 'host': 'str',
|
|
|
|
'port': 'str',
|
2018-07-03 17:56:48 +02:00
|
|
|
'family': 'NetworkAddressFamily' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_SPICE' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @SpiceServerInfo:
|
|
|
|
#
|
|
|
|
# Information about a SPICE server
|
|
|
|
#
|
|
|
|
# @auth: authentication method
|
|
|
|
#
|
|
|
|
# Since: 2.1
|
|
|
|
##
|
|
|
|
{ 'struct': 'SpiceServerInfo',
|
|
|
|
'base': 'SpiceBasicInfo',
|
2018-07-03 17:56:48 +02:00
|
|
|
'data': { '*auth': 'str' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_SPICE' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @SpiceChannel:
|
|
|
|
#
|
|
|
|
# Information about a SPICE client channel.
|
|
|
|
#
|
|
|
|
# @connection-id: SPICE connection id number. All channels with the same id
|
|
|
|
# belong to the same SPICE session.
|
|
|
|
#
|
|
|
|
# @channel-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 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.
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
##
|
|
|
|
{ 'struct': 'SpiceChannel',
|
|
|
|
'base': 'SpiceBasicInfo',
|
|
|
|
'data': {'connection-id': 'int', 'channel-type': 'int', 'channel-id': 'int',
|
2018-07-03 17:56:48 +02:00
|
|
|
'tls': 'bool'},
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_SPICE' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @SpiceQueryMouseMode:
|
|
|
|
#
|
|
|
|
# An enumeration of Spice mouse states.
|
|
|
|
#
|
|
|
|
# @client: Mouse cursor position is determined by the client.
|
|
|
|
#
|
|
|
|
# @server: Mouse cursor position is determined by the server.
|
|
|
|
#
|
|
|
|
# @unknown: No information is available about mouse mode used by
|
|
|
|
# the spice server.
|
|
|
|
#
|
|
|
|
# Note: spice/enums.h has a SpiceMouseMode already, hence the name.
|
|
|
|
#
|
|
|
|
# Since: 1.1
|
|
|
|
##
|
|
|
|
{ 'enum': 'SpiceQueryMouseMode',
|
2018-07-03 17:56:48 +02:00
|
|
|
'data': [ 'client', 'server', 'unknown' ],
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_SPICE' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @SpiceInfo:
|
|
|
|
#
|
|
|
|
# Information about the SPICE session.
|
|
|
|
#
|
|
|
|
# @enabled: true if the SPICE server is enabled, false otherwise
|
|
|
|
#
|
|
|
|
# @migrated: true if the last guest migration completed and spice
|
|
|
|
# migration had completed as well. false otherwise. (since 1.4)
|
|
|
|
#
|
|
|
|
# @host: The hostname the SPICE server is bound to. This depends on
|
|
|
|
# the name resolution on the host and may be an IP address.
|
|
|
|
#
|
|
|
|
# @port: The SPICE server's port number.
|
|
|
|
#
|
|
|
|
# @compiled-version: SPICE server version.
|
|
|
|
#
|
|
|
|
# @tls-port: The SPICE server's TLS port number.
|
|
|
|
#
|
|
|
|
# @auth: the current authentication type used by the server
|
2020-02-13 18:56:30 +01:00
|
|
|
#
|
|
|
|
# - 'none' if no authentication is being used
|
|
|
|
# - 'spice' uses SASL or direct TLS authentication, depending on command
|
|
|
|
# line options
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# @mouse-mode: The mode in which the mouse cursor is displayed currently. Can
|
|
|
|
# be determined by the client or the server, or unknown if spice
|
|
|
|
# server doesn't provide this information. (since: 1.1)
|
|
|
|
#
|
|
|
|
# @channels: a list of @SpiceChannel for each active spice channel
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
##
|
|
|
|
{ 'struct': 'SpiceInfo',
|
|
|
|
'data': {'enabled': 'bool', 'migrated': 'bool', '*host': 'str', '*port': 'int',
|
|
|
|
'*tls-port': 'int', '*auth': 'str', '*compiled-version': 'str',
|
2018-07-03 17:56:48 +02:00
|
|
|
'mouse-mode': 'SpiceQueryMouseMode', '*channels': ['SpiceChannel']},
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_SPICE' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @query-spice:
|
|
|
|
#
|
|
|
|
# Returns information about the current SPICE server
|
|
|
|
#
|
|
|
|
# Returns: @SpiceInfo
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# -> { "execute": "query-spice" }
|
|
|
|
# <- { "return": {
|
|
|
|
# "enabled": true,
|
|
|
|
# "auth": "spice",
|
|
|
|
# "port": 5920,
|
|
|
|
# "tls-port": 5921,
|
|
|
|
# "host": "0.0.0.0",
|
|
|
|
# "channels": [
|
|
|
|
# {
|
|
|
|
# "port": "54924",
|
|
|
|
# "family": "ipv4",
|
|
|
|
# "channel-type": 1,
|
|
|
|
# "connection-id": 1804289383,
|
|
|
|
# "host": "127.0.0.1",
|
|
|
|
# "channel-id": 0,
|
|
|
|
# "tls": true
|
|
|
|
# },
|
|
|
|
# {
|
|
|
|
# "port": "36710",
|
|
|
|
# "family": "ipv4",
|
|
|
|
# "channel-type": 4,
|
|
|
|
# "connection-id": 1804289383,
|
|
|
|
# "host": "127.0.0.1",
|
|
|
|
# "channel-id": 0,
|
|
|
|
# "tls": false
|
|
|
|
# },
|
|
|
|
# [ ... more channels follow ... ]
|
|
|
|
# ]
|
|
|
|
# }
|
|
|
|
# }
|
|
|
|
#
|
|
|
|
##
|
2018-07-03 17:56:48 +02:00
|
|
|
{ 'command': 'query-spice', 'returns': 'SpiceInfo',
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_SPICE' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @SPICE_CONNECTED:
|
|
|
|
#
|
|
|
|
# Emitted when a SPICE client establishes a connection
|
|
|
|
#
|
|
|
|
# @server: server information
|
|
|
|
#
|
|
|
|
# @client: client information
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# <- { "timestamp": {"seconds": 1290688046, "microseconds": 388707},
|
|
|
|
# "event": "SPICE_CONNECTED",
|
|
|
|
# "data": {
|
|
|
|
# "server": { "port": "5920", "family": "ipv4", "host": "127.0.0.1"},
|
|
|
|
# "client": {"port": "52873", "family": "ipv4", "host": "127.0.0.1"}
|
|
|
|
# }}
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'event': 'SPICE_CONNECTED',
|
|
|
|
'data': { 'server': 'SpiceBasicInfo',
|
2018-07-03 17:56:48 +02:00
|
|
|
'client': 'SpiceBasicInfo' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_SPICE' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @SPICE_INITIALIZED:
|
|
|
|
#
|
|
|
|
# Emitted after initial handshake and authentication takes place (if any)
|
|
|
|
# and the SPICE channel is up and running
|
|
|
|
#
|
|
|
|
# @server: server information
|
|
|
|
#
|
|
|
|
# @client: client information
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# <- { "timestamp": {"seconds": 1290688046, "microseconds": 417172},
|
|
|
|
# "event": "SPICE_INITIALIZED",
|
|
|
|
# "data": {"server": {"auth": "spice", "port": "5921",
|
|
|
|
# "family": "ipv4", "host": "127.0.0.1"},
|
|
|
|
# "client": {"port": "49004", "family": "ipv4", "channel-type": 3,
|
|
|
|
# "connection-id": 1804289383, "host": "127.0.0.1",
|
|
|
|
# "channel-id": 0, "tls": true}
|
|
|
|
# }}
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'event': 'SPICE_INITIALIZED',
|
|
|
|
'data': { 'server': 'SpiceServerInfo',
|
2018-07-03 17:56:48 +02:00
|
|
|
'client': 'SpiceChannel' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_SPICE' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @SPICE_DISCONNECTED:
|
|
|
|
#
|
|
|
|
# Emitted when the SPICE connection is closed
|
|
|
|
#
|
|
|
|
# @server: server information
|
|
|
|
#
|
|
|
|
# @client: client information
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# <- { "timestamp": {"seconds": 1290688046, "microseconds": 388707},
|
|
|
|
# "event": "SPICE_DISCONNECTED",
|
|
|
|
# "data": {
|
|
|
|
# "server": { "port": "5920", "family": "ipv4", "host": "127.0.0.1"},
|
|
|
|
# "client": {"port": "52873", "family": "ipv4", "host": "127.0.0.1"}
|
|
|
|
# }}
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'event': 'SPICE_DISCONNECTED',
|
|
|
|
'data': { 'server': 'SpiceBasicInfo',
|
2018-07-03 17:56:48 +02:00
|
|
|
'client': 'SpiceBasicInfo' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_SPICE' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @SPICE_MIGRATE_COMPLETED:
|
|
|
|
#
|
|
|
|
# Emitted when SPICE migration has completed
|
|
|
|
#
|
|
|
|
# Since: 1.3
|
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# <- { "timestamp": {"seconds": 1290688046, "microseconds": 417172},
|
|
|
|
# "event": "SPICE_MIGRATE_COMPLETED" }
|
|
|
|
#
|
|
|
|
##
|
2018-07-03 17:56:48 +02:00
|
|
|
{ 'event': 'SPICE_MIGRATE_COMPLETED',
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_SPICE' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# == VNC
|
|
|
|
##
|
|
|
|
|
|
|
|
##
|
|
|
|
# @VncBasicInfo:
|
|
|
|
#
|
|
|
|
# The basic information for vnc network connection
|
|
|
|
#
|
|
|
|
# @host: IP address
|
|
|
|
#
|
|
|
|
# @service: The service name of the vnc port. This may depend on the host
|
|
|
|
# system's service database so symbolic names should not be relied
|
|
|
|
# on.
|
|
|
|
#
|
|
|
|
# @family: address family
|
|
|
|
#
|
|
|
|
# @websocket: true in case the socket is a websocket (since 2.3).
|
|
|
|
#
|
|
|
|
# Since: 2.1
|
|
|
|
##
|
|
|
|
{ 'struct': 'VncBasicInfo',
|
|
|
|
'data': { 'host': 'str',
|
|
|
|
'service': 'str',
|
|
|
|
'family': 'NetworkAddressFamily',
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
'websocket': 'bool' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @VncServerInfo:
|
|
|
|
#
|
|
|
|
# The network connection information for server
|
|
|
|
#
|
|
|
|
# @auth: authentication method used for
|
|
|
|
# the plain (non-websocket) VNC server
|
|
|
|
#
|
|
|
|
# Since: 2.1
|
|
|
|
##
|
|
|
|
{ 'struct': 'VncServerInfo',
|
|
|
|
'base': 'VncBasicInfo',
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
'data': { '*auth': 'str' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @VncClientInfo:
|
|
|
|
#
|
|
|
|
# Information about a connected VNC client.
|
|
|
|
#
|
|
|
|
# @x509_dname: If x509 authentication is in use, the Distinguished
|
|
|
|
# Name of the client.
|
|
|
|
#
|
|
|
|
# @sasl_username: If SASL authentication is in use, the SASL username
|
|
|
|
# used for authentication.
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
##
|
|
|
|
{ 'struct': 'VncClientInfo',
|
|
|
|
'base': 'VncBasicInfo',
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
'data': { '*x509_dname': 'str', '*sasl_username': 'str' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @VncInfo:
|
|
|
|
#
|
|
|
|
# Information about the VNC session.
|
|
|
|
#
|
|
|
|
# @enabled: true if the VNC server is enabled, false otherwise
|
|
|
|
#
|
|
|
|
# @host: The hostname the VNC server is bound to. This depends on
|
|
|
|
# the name resolution on the host and may be an IP address.
|
|
|
|
#
|
2020-02-13 18:56:30 +01:00
|
|
|
# @family: - 'ipv6' if the host is listening for IPv6 connections
|
|
|
|
# - 'ipv4' if the host is listening for IPv4 connections
|
|
|
|
# - 'unix' if the host is listening on a unix domain socket
|
|
|
|
# - 'unknown' otherwise
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# @service: The service name of the server's port. This may depends
|
|
|
|
# on the host system's service database so symbolic names should not
|
|
|
|
# be relied on.
|
|
|
|
#
|
|
|
|
# @auth: the current authentication type used by the server
|
2020-02-13 18:56:30 +01:00
|
|
|
#
|
|
|
|
# - 'none' if no authentication is being used
|
|
|
|
# - 'vnc' if VNC authentication is being used
|
|
|
|
# - 'vencrypt+plain' if VEncrypt is used with plain text authentication
|
|
|
|
# - 'vencrypt+tls+none' if VEncrypt is used with TLS and no authentication
|
|
|
|
# - 'vencrypt+tls+vnc' if VEncrypt is used with TLS and VNC authentication
|
|
|
|
# - 'vencrypt+tls+plain' if VEncrypt is used with TLS and plain text auth
|
|
|
|
# - 'vencrypt+x509+none' if VEncrypt is used with x509 and no auth
|
|
|
|
# - 'vencrypt+x509+vnc' if VEncrypt is used with x509 and VNC auth
|
|
|
|
# - 'vencrypt+x509+plain' if VEncrypt is used with x509 and plain text auth
|
|
|
|
# - 'vencrypt+tls+sasl' if VEncrypt is used with TLS and SASL auth
|
|
|
|
# - 'vencrypt+x509+sasl' if VEncrypt is used with x509 and SASL auth
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# @clients: a list of @VncClientInfo of all currently connected clients
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
##
|
|
|
|
{ 'struct': 'VncInfo',
|
|
|
|
'data': {'enabled': 'bool', '*host': 'str',
|
|
|
|
'*family': 'NetworkAddressFamily',
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
'*service': 'str', '*auth': 'str', '*clients': ['VncClientInfo']},
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @VncPrimaryAuth:
|
|
|
|
#
|
|
|
|
# vnc primary authentication method.
|
|
|
|
#
|
|
|
|
# Since: 2.3
|
|
|
|
##
|
|
|
|
{ 'enum': 'VncPrimaryAuth',
|
|
|
|
'data': [ 'none', 'vnc', 'ra2', 'ra2ne', 'tight', 'ultra',
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
'tls', 'vencrypt', 'sasl' ],
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @VncVencryptSubAuth:
|
|
|
|
#
|
|
|
|
# vnc sub authentication method with vencrypt.
|
|
|
|
#
|
|
|
|
# Since: 2.3
|
|
|
|
##
|
|
|
|
{ 'enum': 'VncVencryptSubAuth',
|
|
|
|
'data': [ 'plain',
|
|
|
|
'tls-none', 'x509-none',
|
|
|
|
'tls-vnc', 'x509-vnc',
|
|
|
|
'tls-plain', 'x509-plain',
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
'tls-sasl', 'x509-sasl' ],
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @VncServerInfo2:
|
|
|
|
#
|
|
|
|
# The network connection information for server
|
|
|
|
#
|
|
|
|
# @auth: The current authentication type used by the servers
|
|
|
|
#
|
|
|
|
# @vencrypt: The vencrypt sub authentication type used by the
|
|
|
|
# servers, only specified in case auth == vencrypt.
|
|
|
|
#
|
|
|
|
# Since: 2.9
|
|
|
|
##
|
|
|
|
{ 'struct': 'VncServerInfo2',
|
|
|
|
'base': 'VncBasicInfo',
|
|
|
|
'data': { 'auth' : 'VncPrimaryAuth',
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
'*vencrypt' : 'VncVencryptSubAuth' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @VncInfo2:
|
|
|
|
#
|
|
|
|
# Information about a vnc server
|
|
|
|
#
|
|
|
|
# @id: vnc server name.
|
|
|
|
#
|
|
|
|
# @server: A list of @VncBasincInfo describing all listening sockets.
|
|
|
|
# The list can be empty (in case the vnc server is disabled).
|
|
|
|
# It also may have multiple entries: normal + websocket,
|
|
|
|
# possibly also ipv4 + ipv6 in the future.
|
|
|
|
#
|
|
|
|
# @clients: A list of @VncClientInfo of all currently connected clients.
|
|
|
|
# The list can be empty, for obvious reasons.
|
|
|
|
#
|
|
|
|
# @auth: The current authentication type used by the non-websockets servers
|
|
|
|
#
|
|
|
|
# @vencrypt: The vencrypt authentication type used by the servers,
|
|
|
|
# only specified in case auth == vencrypt.
|
|
|
|
#
|
|
|
|
# @display: The display device the vnc server is linked to.
|
|
|
|
#
|
|
|
|
# Since: 2.3
|
|
|
|
##
|
|
|
|
{ 'struct': 'VncInfo2',
|
|
|
|
'data': { 'id' : 'str',
|
|
|
|
'server' : ['VncServerInfo2'],
|
|
|
|
'clients' : ['VncClientInfo'],
|
|
|
|
'auth' : 'VncPrimaryAuth',
|
|
|
|
'*vencrypt' : 'VncVencryptSubAuth',
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
'*display' : 'str' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @query-vnc:
|
|
|
|
#
|
|
|
|
# Returns information about the current VNC server
|
|
|
|
#
|
|
|
|
# Returns: @VncInfo
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# -> { "execute": "query-vnc" }
|
|
|
|
# <- { "return": {
|
|
|
|
# "enabled":true,
|
|
|
|
# "host":"0.0.0.0",
|
|
|
|
# "service":"50402",
|
|
|
|
# "auth":"vnc",
|
|
|
|
# "family":"ipv4",
|
|
|
|
# "clients":[
|
|
|
|
# {
|
|
|
|
# "host":"127.0.0.1",
|
|
|
|
# "service":"50401",
|
|
|
|
# "family":"ipv4"
|
|
|
|
# }
|
|
|
|
# ]
|
|
|
|
# }
|
|
|
|
# }
|
|
|
|
#
|
|
|
|
##
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
{ 'command': 'query-vnc', 'returns': 'VncInfo',
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
##
|
|
|
|
# @query-vnc-servers:
|
|
|
|
#
|
|
|
|
# Returns a list of vnc servers. The list can be empty.
|
|
|
|
#
|
|
|
|
# Returns: a list of @VncInfo2
|
|
|
|
#
|
|
|
|
# Since: 2.3
|
|
|
|
##
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
{ 'command': 'query-vnc-servers', 'returns': ['VncInfo2'],
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @change-vnc-password:
|
|
|
|
#
|
|
|
|
# Change the VNC server password.
|
|
|
|
#
|
2020-02-13 18:56:26 +01:00
|
|
|
# @password: the new password to use with VNC authentication
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Since: 1.1
|
|
|
|
#
|
2020-02-13 18:56:26 +01:00
|
|
|
# Notes: An empty password in this command will set the password to the empty
|
|
|
|
# string. Existing clients are unaffected by executing this command.
|
2017-08-24 21:14:00 +02:00
|
|
|
##
|
2018-12-08 12:16:04 +01:00
|
|
|
{ 'command': 'change-vnc-password',
|
|
|
|
'data': { 'password': 'str' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @VNC_CONNECTED:
|
|
|
|
#
|
|
|
|
# Emitted when a VNC client establishes a connection
|
|
|
|
#
|
|
|
|
# @server: server information
|
|
|
|
#
|
|
|
|
# @client: client information
|
|
|
|
#
|
|
|
|
# Note: This event is emitted before any authentication takes place, thus
|
2020-02-13 18:56:26 +01:00
|
|
|
# the authentication ID is not provided
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.13
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# <- { "event": "VNC_CONNECTED",
|
|
|
|
# "data": {
|
|
|
|
# "server": { "auth": "sasl", "family": "ipv4",
|
|
|
|
# "service": "5901", "host": "0.0.0.0" },
|
|
|
|
# "client": { "family": "ipv4", "service": "58425",
|
|
|
|
# "host": "127.0.0.1" } },
|
|
|
|
# "timestamp": { "seconds": 1262976601, "microseconds": 975795 } }
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'event': 'VNC_CONNECTED',
|
|
|
|
'data': { 'server': 'VncServerInfo',
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
'client': 'VncBasicInfo' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @VNC_INITIALIZED:
|
|
|
|
#
|
|
|
|
# Emitted after authentication takes place (if any) and the VNC session is
|
|
|
|
# made active
|
|
|
|
#
|
|
|
|
# @server: server information
|
|
|
|
#
|
|
|
|
# @client: client information
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.13
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# <- { "event": "VNC_INITIALIZED",
|
|
|
|
# "data": {
|
|
|
|
# "server": { "auth": "sasl", "family": "ipv4",
|
|
|
|
# "service": "5901", "host": "0.0.0.0"},
|
|
|
|
# "client": { "family": "ipv4", "service": "46089",
|
|
|
|
# "host": "127.0.0.1", "sasl_username": "luiz" } },
|
|
|
|
# "timestamp": { "seconds": 1263475302, "microseconds": 150772 } }
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'event': 'VNC_INITIALIZED',
|
|
|
|
'data': { 'server': 'VncServerInfo',
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
'client': 'VncClientInfo' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @VNC_DISCONNECTED:
|
|
|
|
#
|
|
|
|
# Emitted when the connection is closed
|
|
|
|
#
|
|
|
|
# @server: server information
|
|
|
|
#
|
|
|
|
# @client: client information
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.13
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# <- { "event": "VNC_DISCONNECTED",
|
|
|
|
# "data": {
|
|
|
|
# "server": { "auth": "sasl", "family": "ipv4",
|
|
|
|
# "service": "5901", "host": "0.0.0.0" },
|
|
|
|
# "client": { "family": "ipv4", "service": "58425",
|
|
|
|
# "host": "127.0.0.1", "sasl_username": "luiz" } },
|
|
|
|
# "timestamp": { "seconds": 1262976601, "microseconds": 975795 } }
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'event': 'VNC_DISCONNECTED',
|
|
|
|
'data': { 'server': 'VncServerInfo',
|
qapi: add conditions to VNC type/commands/events on the schema
Add #if defined(CONFIG_VNC) in generated code, and adjust the
qmp/hmp code accordingly.
query-qmp-schema no longer reports the command/events etc as
available when disabled at compile.
Commands made conditional:
* query-vnc, query-vnc-servers, change-vnc-password
Before the patch, the commands for !CONFIG_VNC are stubs that fail
like this:
{"error": {"class": "GenericError",
"desc": "The feature 'vnc' is not enabled"}}
Afterwards, they fail like this:
{"error": {"class": "CommandNotFound",
"desc": "The command FOO has not been found"}}
I call that an improvement, because it lets clients distinguish
between command unavailable (class CommandNotFound) and command failed
(class GenericError).
Events made conditional:
* VNC_CONNECTED, VNC_INITIALIZED, VNC_DISCONNECTED
HMP change:
* info vnc
Will return "unknown command: 'info vnc'" when VNC is compiled
out (same as error for spice when --disable-spice)
Occurrences of VNC (case insensitive) in the schema that aren't
covered by this change:
* add_client
Command has other uses, including "socket bases character devices".
These are unconditional as far as I can tell.
* set_password, expire_password
In theory, these commands could be used for managing any service's
password. In practice, they're used for VNC and SPICE services.
They're documented for "remote display session" / "remote display
server".
The service is selected by argument @protocol. The code special-cases
protocol-specific argument checking, then calls a protocol-specific
function to do the work. If it fails, the command fails with "Could
not set password". It does when the service isn't compiled in (it's a
stub then).
We could make these commands conditional on the conjunction of all
services [currently: defined(CONFIG_VNC) || defined(CONFIG_SPICE)],
but I doubt it's worthwhile.
* change
Command has other uses, namely changing media.
This patch inlines a stub; no functional change.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-14-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2018-07-03 17:56:47 +02:00
|
|
|
'client': 'VncClientInfo' },
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': 'CONFIG_VNC' }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# = Input
|
|
|
|
##
|
|
|
|
|
|
|
|
##
|
|
|
|
# @MouseInfo:
|
|
|
|
#
|
|
|
|
# Information about a mouse device.
|
|
|
|
#
|
|
|
|
# @name: the name of the mouse device
|
|
|
|
#
|
|
|
|
# @index: the index of the mouse device
|
|
|
|
#
|
|
|
|
# @current: true if this device is currently receiving mouse events
|
|
|
|
#
|
|
|
|
# @absolute: true if this device supports absolute coordinates as input
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
##
|
|
|
|
{ 'struct': 'MouseInfo',
|
|
|
|
'data': {'name': 'str', 'index': 'int', 'current': 'bool',
|
|
|
|
'absolute': 'bool'} }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @query-mice:
|
|
|
|
#
|
|
|
|
# Returns information about each active mouse device
|
|
|
|
#
|
|
|
|
# Returns: a list of @MouseInfo for each device
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 0.14
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# -> { "execute": "query-mice" }
|
|
|
|
# <- { "return": [
|
|
|
|
# {
|
|
|
|
# "name":"QEMU Microsoft Mouse",
|
|
|
|
# "index":0,
|
|
|
|
# "current":false,
|
|
|
|
# "absolute":false
|
|
|
|
# },
|
|
|
|
# {
|
|
|
|
# "name":"QEMU PS/2 Mouse",
|
|
|
|
# "index":1,
|
|
|
|
# "current":true,
|
|
|
|
# "absolute":true
|
|
|
|
# }
|
|
|
|
# ]
|
|
|
|
# }
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'command': 'query-mice', 'returns': ['MouseInfo'] }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @QKeyCode:
|
|
|
|
#
|
|
|
|
# An enumeration of key name.
|
|
|
|
#
|
|
|
|
# This is used by the @send-key command.
|
|
|
|
#
|
|
|
|
# @unmapped: since 2.0
|
|
|
|
# @pause: since 2.0
|
|
|
|
# @ro: since 2.4
|
|
|
|
# @kp_comma: since 2.4
|
|
|
|
# @kp_equals: since 2.6
|
|
|
|
# @power: since 2.6
|
|
|
|
# @hiragana: since 2.9
|
|
|
|
# @henkan: since 2.9
|
|
|
|
# @yen: since 2.9
|
|
|
|
#
|
|
|
|
# @sleep: since 2.10
|
|
|
|
# @wake: since 2.10
|
|
|
|
# @audionext: since 2.10
|
|
|
|
# @audioprev: since 2.10
|
|
|
|
# @audiostop: since 2.10
|
|
|
|
# @audioplay: since 2.10
|
|
|
|
# @audiomute: since 2.10
|
|
|
|
# @volumeup: since 2.10
|
|
|
|
# @volumedown: since 2.10
|
|
|
|
# @mediaselect: since 2.10
|
|
|
|
# @mail: since 2.10
|
|
|
|
# @calculator: since 2.10
|
|
|
|
# @computer: since 2.10
|
|
|
|
# @ac_home: since 2.10
|
|
|
|
# @ac_back: since 2.10
|
|
|
|
# @ac_forward: since 2.10
|
|
|
|
# @ac_refresh: since 2.10
|
|
|
|
# @ac_bookmarks: since 2.10
|
|
|
|
#
|
2018-01-16 14:42:14 +01:00
|
|
|
# @muhenkan: since 2.12
|
|
|
|
# @katakanahiragana: since 2.12
|
|
|
|
#
|
2021-06-17 04:31:13 +02:00
|
|
|
# @lang1: since 6.1
|
|
|
|
# @lang2: since 6.1
|
|
|
|
#
|
2017-10-19 16:28:47 +02:00
|
|
|
# 'sysrq' was mistakenly added to hack around the fact that
|
|
|
|
# the ps2 driver was not generating correct scancodes sequences
|
|
|
|
# when 'alt+print' was pressed. This flaw is now fixed and the
|
|
|
|
# 'sysrq' key serves no further purpose. Any further use of
|
|
|
|
# 'sysrq' will be transparently changed to 'print', so they
|
|
|
|
# are effectively synonyms.
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 1.3
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'enum': 'QKeyCode',
|
|
|
|
'data': [ 'unmapped',
|
|
|
|
'shift', 'shift_r', 'alt', 'alt_r', 'ctrl',
|
|
|
|
'ctrl_r', 'menu', 'esc', '1', '2', '3', '4', '5', '6', '7', '8',
|
|
|
|
'9', '0', 'minus', 'equal', 'backspace', 'tab', 'q', 'w', 'e',
|
|
|
|
'r', 't', 'y', 'u', 'i', 'o', 'p', 'bracket_left', 'bracket_right',
|
|
|
|
'ret', 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'semicolon',
|
|
|
|
'apostrophe', 'grave_accent', 'backslash', 'z', 'x', 'c', 'v', 'b',
|
|
|
|
'n', 'm', 'comma', 'dot', 'slash', 'asterisk', 'spc', 'caps_lock',
|
|
|
|
'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'f10',
|
|
|
|
'num_lock', 'scroll_lock', 'kp_divide', 'kp_multiply',
|
|
|
|
'kp_subtract', 'kp_add', 'kp_enter', 'kp_decimal', 'sysrq', 'kp_0',
|
|
|
|
'kp_1', 'kp_2', 'kp_3', 'kp_4', 'kp_5', 'kp_6', 'kp_7', 'kp_8',
|
|
|
|
'kp_9', 'less', 'f11', 'f12', 'print', 'home', 'pgup', 'pgdn', 'end',
|
|
|
|
'left', 'up', 'down', 'right', 'insert', 'delete', 'stop', 'again',
|
|
|
|
'props', 'undo', 'front', 'copy', 'open', 'paste', 'find', 'cut',
|
|
|
|
'lf', 'help', 'meta_l', 'meta_r', 'compose', 'pause',
|
2018-01-16 14:42:14 +01:00
|
|
|
'ro', 'hiragana', 'henkan', 'yen', 'muhenkan', 'katakanahiragana',
|
2017-08-24 21:14:00 +02:00
|
|
|
'kp_comma', 'kp_equals', 'power', 'sleep', 'wake',
|
|
|
|
'audionext', 'audioprev', 'audiostop', 'audioplay', 'audiomute',
|
|
|
|
'volumeup', 'volumedown', 'mediaselect',
|
|
|
|
'mail', 'calculator', 'computer',
|
2021-06-17 04:31:13 +02:00
|
|
|
'ac_home', 'ac_back', 'ac_forward', 'ac_refresh', 'ac_bookmarks',
|
|
|
|
'lang1', 'lang2' ] }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
2021-09-17 16:31:14 +02:00
|
|
|
##
|
|
|
|
# @KeyValueKind:
|
|
|
|
#
|
|
|
|
# Since: 1.3
|
|
|
|
##
|
|
|
|
{ 'enum': 'KeyValueKind',
|
|
|
|
'data': [ 'number', 'qcode' ] }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @IntWrapper:
|
|
|
|
#
|
|
|
|
# Since: 1.3
|
|
|
|
##
|
|
|
|
{ 'struct': 'IntWrapper',
|
|
|
|
'data': { 'data': 'int' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @QKeyCodeWrapper:
|
|
|
|
#
|
|
|
|
# Since: 1.3
|
|
|
|
##
|
|
|
|
{ 'struct': 'QKeyCodeWrapper',
|
|
|
|
'data': { 'data': 'QKeyCode' } }
|
|
|
|
|
2017-08-24 21:14:00 +02:00
|
|
|
##
|
|
|
|
# @KeyValue:
|
|
|
|
#
|
|
|
|
# Represents a keyboard key.
|
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 1.3
|
2017-08-24 21:14:00 +02:00
|
|
|
##
|
|
|
|
{ 'union': 'KeyValue',
|
2021-09-17 16:31:14 +02:00
|
|
|
'base': { 'type': 'KeyValueKind' },
|
|
|
|
'discriminator': 'type',
|
2017-08-24 21:14:00 +02:00
|
|
|
'data': {
|
2021-09-17 16:31:14 +02:00
|
|
|
'number': 'IntWrapper',
|
|
|
|
'qcode': 'QKeyCodeWrapper' } }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @send-key:
|
|
|
|
#
|
|
|
|
# Send keys to guest.
|
|
|
|
#
|
|
|
|
# @keys: An array of @KeyValue elements. All @KeyValues in this array are
|
|
|
|
# simultaneously sent to the guest. A @KeyValue.number value is sent
|
|
|
|
# directly to the guest, while @KeyValue.qcode must be a valid
|
|
|
|
# @QKeyCode value
|
|
|
|
#
|
|
|
|
# @hold-time: time to delay key up events, milliseconds. Defaults
|
|
|
|
# to 100
|
|
|
|
#
|
2020-02-13 18:56:30 +01:00
|
|
|
# Returns: - Nothing on success
|
|
|
|
# - If key is unknown or redundant, InvalidParameter
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
2020-11-18 07:41:58 +01:00
|
|
|
# Since: 1.3
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# -> { "execute": "send-key",
|
|
|
|
# "arguments": { "keys": [ { "type": "qcode", "data": "ctrl" },
|
|
|
|
# { "type": "qcode", "data": "alt" },
|
|
|
|
# { "type": "qcode", "data": "delete" } ] } }
|
|
|
|
# <- { "return": {} }
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'command': 'send-key',
|
|
|
|
'data': { 'keys': ['KeyValue'], '*hold-time': 'int' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @InputButton:
|
|
|
|
#
|
|
|
|
# Button of a pointer input device (mouse, tablet).
|
|
|
|
#
|
|
|
|
# @side: front side button of a 5-button mouse (since 2.9)
|
|
|
|
#
|
|
|
|
# @extra: rear side button of a 5-button mouse (since 2.9)
|
|
|
|
#
|
|
|
|
# Since: 2.0
|
|
|
|
##
|
|
|
|
{ 'enum' : 'InputButton',
|
|
|
|
'data' : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down', 'side',
|
|
|
|
'extra' ] }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @InputAxis:
|
|
|
|
#
|
|
|
|
# Position axis of a pointer input device (mouse, tablet).
|
|
|
|
#
|
|
|
|
# Since: 2.0
|
|
|
|
##
|
|
|
|
{ 'enum' : 'InputAxis',
|
|
|
|
'data' : [ 'x', 'y' ] }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @InputKeyEvent:
|
|
|
|
#
|
|
|
|
# Keyboard input event.
|
|
|
|
#
|
|
|
|
# @key: Which key this event is for.
|
|
|
|
# @down: True for key-down and false for key-up events.
|
|
|
|
#
|
|
|
|
# Since: 2.0
|
|
|
|
##
|
|
|
|
{ 'struct' : 'InputKeyEvent',
|
|
|
|
'data' : { 'key' : 'KeyValue',
|
|
|
|
'down' : 'bool' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @InputBtnEvent:
|
|
|
|
#
|
|
|
|
# Pointer button input event.
|
|
|
|
#
|
|
|
|
# @button: Which button this event is for.
|
|
|
|
# @down: True for key-down and false for key-up events.
|
|
|
|
#
|
|
|
|
# Since: 2.0
|
|
|
|
##
|
|
|
|
{ 'struct' : 'InputBtnEvent',
|
|
|
|
'data' : { 'button' : 'InputButton',
|
|
|
|
'down' : 'bool' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @InputMoveEvent:
|
|
|
|
#
|
|
|
|
# Pointer motion input event.
|
|
|
|
#
|
2020-02-13 18:56:26 +01:00
|
|
|
# @axis: Which axis is referenced by @value.
|
|
|
|
# @value: Pointer position. For absolute coordinates the
|
|
|
|
# valid range is 0 -> 0x7ffff
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Since: 2.0
|
|
|
|
##
|
|
|
|
{ 'struct' : 'InputMoveEvent',
|
|
|
|
'data' : { 'axis' : 'InputAxis',
|
|
|
|
'value' : 'int' } }
|
|
|
|
|
2021-09-17 16:31:15 +02:00
|
|
|
##
|
|
|
|
# @InputEventKind:
|
|
|
|
#
|
|
|
|
# Since: 2.0
|
|
|
|
##
|
|
|
|
{ 'enum': 'InputEventKind',
|
|
|
|
'data': [ 'key', 'btn', 'rel', 'abs' ] }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @InputKeyEventWrapper:
|
|
|
|
#
|
|
|
|
# Since: 2.0
|
|
|
|
##
|
|
|
|
{ 'struct': 'InputKeyEventWrapper',
|
|
|
|
'data': { 'data': 'InputKeyEvent' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @InputBtnEventWrapper:
|
|
|
|
#
|
|
|
|
# Since: 2.0
|
|
|
|
##
|
|
|
|
{ 'struct': 'InputBtnEventWrapper',
|
|
|
|
'data': { 'data': 'InputBtnEvent' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @InputMoveEventWrapper:
|
|
|
|
#
|
|
|
|
# Since: 2.0
|
|
|
|
##
|
|
|
|
{ 'struct': 'InputMoveEventWrapper',
|
|
|
|
'data': { 'data': 'InputMoveEvent' } }
|
|
|
|
|
2017-08-24 21:14:00 +02:00
|
|
|
##
|
|
|
|
# @InputEvent:
|
|
|
|
#
|
|
|
|
# Input event union.
|
|
|
|
#
|
|
|
|
# @type: the input type, one of:
|
2020-02-13 18:56:33 +01:00
|
|
|
#
|
2020-02-13 18:56:26 +01:00
|
|
|
# - 'key': Input event of Keyboard
|
|
|
|
# - 'btn': Input event of pointer buttons
|
|
|
|
# - 'rel': Input event of relative pointer motion
|
|
|
|
# - 'abs': Input event of absolute pointer motion
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Since: 2.0
|
|
|
|
##
|
|
|
|
{ 'union' : 'InputEvent',
|
2021-09-17 16:31:15 +02:00
|
|
|
'base': { 'type': 'InputEventKind' },
|
|
|
|
'discriminator': 'type',
|
|
|
|
'data' : { 'key' : 'InputKeyEventWrapper',
|
|
|
|
'btn' : 'InputBtnEventWrapper',
|
|
|
|
'rel' : 'InputMoveEventWrapper',
|
|
|
|
'abs' : 'InputMoveEventWrapper' } }
|
2017-08-24 21:14:00 +02:00
|
|
|
|
|
|
|
##
|
|
|
|
# @input-send-event:
|
|
|
|
#
|
|
|
|
# Send input event(s) to guest.
|
|
|
|
#
|
|
|
|
# The @device and @head parameters can be used to send the input event
|
|
|
|
# to specific input devices in case (a) multiple input devices of the
|
|
|
|
# same kind are added to the virtual machine and (b) you have
|
|
|
|
# configured input routing (see docs/multiseat.txt) for those input
|
|
|
|
# devices. The parameters work exactly like the device and head
|
|
|
|
# properties of input devices. If @device is missing, only devices
|
|
|
|
# that have no input routing config are admissible. If @device is
|
|
|
|
# specified, both input devices with and without input routing config
|
|
|
|
# are admissible, but devices with input routing config take
|
|
|
|
# precedence.
|
|
|
|
#
|
2020-02-13 18:56:28 +01:00
|
|
|
# @device: display device to send event(s) to.
|
|
|
|
# @head: head to send event(s) to, in case the
|
|
|
|
# display device supports multiple scanouts.
|
|
|
|
# @events: List of InputEvent union.
|
|
|
|
#
|
|
|
|
# Returns: Nothing on success.
|
|
|
|
#
|
2017-08-24 21:14:00 +02:00
|
|
|
# Since: 2.6
|
|
|
|
#
|
|
|
|
# Note: The consoles are visible in the qom tree, under
|
2020-02-13 18:56:26 +01:00
|
|
|
# /backend/console[$index]. They have a device link and head property,
|
|
|
|
# so it is possible to map which console belongs to which device and
|
|
|
|
# display.
|
2017-08-24 21:14:00 +02:00
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# 1. Press left mouse button.
|
|
|
|
#
|
|
|
|
# -> { "execute": "input-send-event",
|
|
|
|
# "arguments": { "device": "video0",
|
|
|
|
# "events": [ { "type": "btn",
|
|
|
|
# "data" : { "down": true, "button": "left" } } ] } }
|
|
|
|
# <- { "return": {} }
|
|
|
|
#
|
|
|
|
# -> { "execute": "input-send-event",
|
|
|
|
# "arguments": { "device": "video0",
|
|
|
|
# "events": [ { "type": "btn",
|
|
|
|
# "data" : { "down": false, "button": "left" } } ] } }
|
|
|
|
# <- { "return": {} }
|
|
|
|
#
|
|
|
|
# 2. Press ctrl-alt-del.
|
|
|
|
#
|
|
|
|
# -> { "execute": "input-send-event",
|
|
|
|
# "arguments": { "events": [
|
|
|
|
# { "type": "key", "data" : { "down": true,
|
|
|
|
# "key": {"type": "qcode", "data": "ctrl" } } },
|
|
|
|
# { "type": "key", "data" : { "down": true,
|
|
|
|
# "key": {"type": "qcode", "data": "alt" } } },
|
|
|
|
# { "type": "key", "data" : { "down": true,
|
|
|
|
# "key": {"type": "qcode", "data": "delete" } } } ] } }
|
|
|
|
# <- { "return": {} }
|
|
|
|
#
|
|
|
|
# 3. Move mouse pointer to absolute coordinates (20000, 400).
|
|
|
|
#
|
|
|
|
# -> { "execute": "input-send-event" ,
|
|
|
|
# "arguments": { "events": [
|
|
|
|
# { "type": "abs", "data" : { "axis": "x", "value" : 20000 } },
|
|
|
|
# { "type": "abs", "data" : { "axis": "y", "value" : 400 } } ] } }
|
|
|
|
# <- { "return": {} }
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'command': 'input-send-event',
|
|
|
|
'data': { '*device': 'str',
|
|
|
|
'*head' : 'int',
|
|
|
|
'events' : [ 'InputEvent' ] } }
|
2018-02-02 12:10:14 +01:00
|
|
|
|
|
|
|
##
|
|
|
|
# @DisplayGTK:
|
|
|
|
#
|
|
|
|
# GTK display options.
|
|
|
|
#
|
|
|
|
# @grab-on-hover: Grab keyboard input on mouse hover.
|
2018-08-27 11:56:20 +02:00
|
|
|
# @zoom-to-fit: Zoom guest display to fit into the host window. When
|
|
|
|
# turned off the host window will be resized instead.
|
|
|
|
# In case the display device can notify the guest on
|
|
|
|
# window resizes (virtio-gpu) this will default to "on",
|
|
|
|
# assuming the guest will resize the display to match
|
|
|
|
# the window size then. Otherwise it defaults to "off".
|
|
|
|
# Since 3.1
|
2018-02-02 12:10:14 +01:00
|
|
|
#
|
|
|
|
# Since: 2.12
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'struct' : 'DisplayGTK',
|
2018-08-27 11:56:20 +02:00
|
|
|
'data' : { '*grab-on-hover' : 'bool',
|
|
|
|
'*zoom-to-fit' : 'bool' } }
|
2018-02-02 12:10:14 +01:00
|
|
|
|
2018-11-16 11:14:42 +01:00
|
|
|
##
|
|
|
|
# @DisplayEGLHeadless:
|
|
|
|
#
|
|
|
|
# EGL headless display options.
|
|
|
|
#
|
|
|
|
# @rendernode: Which DRM render node should be used. Default is the first
|
|
|
|
# available node on the host.
|
|
|
|
#
|
|
|
|
# Since: 3.1
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'struct' : 'DisplayEGLHeadless',
|
|
|
|
'data' : { '*rendernode' : 'str' } }
|
|
|
|
|
2018-04-13 15:58:40 +02:00
|
|
|
##
|
|
|
|
# @DisplayGLMode:
|
|
|
|
#
|
|
|
|
# Display OpenGL mode.
|
|
|
|
#
|
|
|
|
# @off: Disable OpenGL (default).
|
|
|
|
# @on: Use OpenGL, pick context type automatically.
|
|
|
|
# Would better be named 'auto' but is called 'on' for backward
|
|
|
|
# compatibility with bool type.
|
|
|
|
# @core: Use OpenGL with Core (desktop) Context.
|
|
|
|
# @es: Use OpenGL with ES (embedded systems) Context.
|
|
|
|
#
|
2018-05-22 12:39:56 +02:00
|
|
|
# Since: 3.0
|
2018-04-13 15:58:40 +02:00
|
|
|
#
|
|
|
|
##
|
2020-07-30 11:16:56 +02:00
|
|
|
{ 'enum' : 'DisplayGLMode',
|
|
|
|
'data' : [ 'off', 'on', 'core', 'es' ] }
|
2018-04-13 15:58:40 +02:00
|
|
|
|
2019-03-11 14:51:27 +01:00
|
|
|
##
|
|
|
|
# @DisplayCurses:
|
|
|
|
#
|
|
|
|
# Curses display options.
|
|
|
|
#
|
|
|
|
# @charset: Font charset used by guest (default: CP437).
|
|
|
|
#
|
|
|
|
# Since: 4.0
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'struct' : 'DisplayCurses',
|
|
|
|
'data' : { '*charset' : 'str' } }
|
|
|
|
|
2018-02-02 12:10:14 +01:00
|
|
|
##
|
|
|
|
# @DisplayType:
|
|
|
|
#
|
|
|
|
# Display (user interface) type.
|
|
|
|
#
|
2019-02-21 12:07:01 +01:00
|
|
|
# @default: The default user interface, selecting from the first available
|
|
|
|
# of gtk, sdl, cocoa, and vnc.
|
|
|
|
#
|
|
|
|
# @none: No user interface or video output display. The guest will
|
|
|
|
# still see an emulated graphics card, but its output will not
|
|
|
|
# be displayed to the QEMU user.
|
|
|
|
#
|
|
|
|
# @gtk: The GTK user interface.
|
|
|
|
#
|
|
|
|
# @sdl: The SDL user interface.
|
|
|
|
#
|
|
|
|
# @egl-headless: No user interface, offload GL operations to a local
|
|
|
|
# DRI device. Graphical display need to be paired with
|
|
|
|
# VNC or Spice. (Since 3.1)
|
|
|
|
#
|
|
|
|
# @curses: Display video output via curses. For graphics device
|
|
|
|
# models which support a text mode, QEMU can display this
|
|
|
|
# output using a curses/ncurses interface. Nothing is
|
|
|
|
# displayed when the graphics device is in graphical mode or
|
|
|
|
# if the graphics device does not support a text
|
|
|
|
# mode. Generally only the VGA device models support text
|
|
|
|
# mode.
|
|
|
|
#
|
|
|
|
# @cocoa: The Cocoa user interface.
|
|
|
|
#
|
2019-02-21 12:07:03 +01:00
|
|
|
# @spice-app: Set up a Spice server and run the default associated
|
|
|
|
# application to connect to it. The server will redirect
|
|
|
|
# the serial console and QEMU monitors. (Since 4.0)
|
|
|
|
#
|
2018-02-02 12:10:14 +01:00
|
|
|
# Since: 2.12
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'enum' : 'DisplayType',
|
ui: Make the DisplayType enum entries conditional
Libvirt's "domcapabilities" command has a way to state whether certain
graphic frontends are available in QEMU or not. Originally, libvirt
looked at the "--help" output of the QEMU binary to determine whether
SDL was available or not (by looking for the "-sdl" parameter in the
help text), but since libvirt stopped doing this analysis of the help
text, the detection of SDL is currently broken, see:
https://bugzilla.redhat.com/show_bug.cgi?id=1790902
QEMU should provide a way via the QMP interface instead. A simple way,
without introducing additional commands, is to make the DisplayType
enum entries conditional, so that the enum only contains the entries if
the corresponding CONFIG_xxx switches have been set. This of course
only gives an indication which possibilities have been enabled during
compile-time of QEMU (and does not take into account whether modules
are later available or not for example - for this we'd need a separate
command), but anyway, this should already be good enough for the above
bug ticket, and it's a good idea anyway to make the QMP interface
conditional here, so let's simply do it.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210615090439.70926-1-thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2021-06-15 11:04:39 +02:00
|
|
|
'data' : [
|
|
|
|
{ 'name': 'default' },
|
|
|
|
{ 'name': 'none' },
|
2021-08-04 10:31:05 +02:00
|
|
|
{ 'name': 'gtk', 'if': 'CONFIG_GTK' },
|
|
|
|
{ 'name': 'sdl', 'if': 'CONFIG_SDL' },
|
ui: Make the DisplayType enum entries conditional
Libvirt's "domcapabilities" command has a way to state whether certain
graphic frontends are available in QEMU or not. Originally, libvirt
looked at the "--help" output of the QEMU binary to determine whether
SDL was available or not (by looking for the "-sdl" parameter in the
help text), but since libvirt stopped doing this analysis of the help
text, the detection of SDL is currently broken, see:
https://bugzilla.redhat.com/show_bug.cgi?id=1790902
QEMU should provide a way via the QMP interface instead. A simple way,
without introducing additional commands, is to make the DisplayType
enum entries conditional, so that the enum only contains the entries if
the corresponding CONFIG_xxx switches have been set. This of course
only gives an indication which possibilities have been enabled during
compile-time of QEMU (and does not take into account whether modules
are later available or not for example - for this we'd need a separate
command), but anyway, this should already be good enough for the above
bug ticket, and it's a good idea anyway to make the QMP interface
conditional here, so let's simply do it.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210615090439.70926-1-thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2021-06-15 11:04:39 +02:00
|
|
|
{ 'name': 'egl-headless',
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': { 'all': ['CONFIG_OPENGL', 'CONFIG_GBM'] } },
|
|
|
|
{ 'name': 'curses', 'if': 'CONFIG_CURSES' },
|
|
|
|
{ 'name': 'cocoa', 'if': 'CONFIG_COCOA' },
|
|
|
|
{ 'name': 'spice-app', 'if': 'CONFIG_SPICE'} ] }
|
2018-02-02 12:10:14 +01:00
|
|
|
|
|
|
|
##
|
|
|
|
# @DisplayOptions:
|
|
|
|
#
|
|
|
|
# Display (user interface) options.
|
|
|
|
#
|
|
|
|
# @type: Which DisplayType qemu should use.
|
|
|
|
# @full-screen: Start user interface in fullscreen mode (default: off).
|
|
|
|
# @window-close: Allow to quit qemu with window close button (default: on).
|
2020-01-31 11:45:18 +01:00
|
|
|
# @show-cursor: Force showing the mouse cursor (default: off).
|
|
|
|
# (since: 5.0)
|
2018-02-02 12:10:14 +01:00
|
|
|
# @gl: Enable OpenGL support (default: off).
|
|
|
|
#
|
|
|
|
# Since: 2.12
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'union' : 'DisplayOptions',
|
|
|
|
'base' : { 'type' : 'DisplayType',
|
|
|
|
'*full-screen' : 'bool',
|
|
|
|
'*window-close' : 'bool',
|
2020-01-31 11:45:18 +01:00
|
|
|
'*show-cursor' : 'bool',
|
2018-04-13 15:58:40 +02:00
|
|
|
'*gl' : 'DisplayGLMode' },
|
2018-02-02 12:10:14 +01:00
|
|
|
'discriminator' : 'type',
|
ui: Make the DisplayType enum entries conditional
Libvirt's "domcapabilities" command has a way to state whether certain
graphic frontends are available in QEMU or not. Originally, libvirt
looked at the "--help" output of the QEMU binary to determine whether
SDL was available or not (by looking for the "-sdl" parameter in the
help text), but since libvirt stopped doing this analysis of the help
text, the detection of SDL is currently broken, see:
https://bugzilla.redhat.com/show_bug.cgi?id=1790902
QEMU should provide a way via the QMP interface instead. A simple way,
without introducing additional commands, is to make the DisplayType
enum entries conditional, so that the enum only contains the entries if
the corresponding CONFIG_xxx switches have been set. This of course
only gives an indication which possibilities have been enabled during
compile-time of QEMU (and does not take into account whether modules
are later available or not for example - for this we'd need a separate
command), but anyway, this should already be good enough for the above
bug ticket, and it's a good idea anyway to make the QMP interface
conditional here, so let's simply do it.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210615090439.70926-1-thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2021-06-15 11:04:39 +02:00
|
|
|
'data' : {
|
2021-08-04 10:31:05 +02:00
|
|
|
'gtk': { 'type': 'DisplayGTK', 'if': 'CONFIG_GTK' },
|
|
|
|
'curses': { 'type': 'DisplayCurses', 'if': 'CONFIG_CURSES' },
|
ui: Make the DisplayType enum entries conditional
Libvirt's "domcapabilities" command has a way to state whether certain
graphic frontends are available in QEMU or not. Originally, libvirt
looked at the "--help" output of the QEMU binary to determine whether
SDL was available or not (by looking for the "-sdl" parameter in the
help text), but since libvirt stopped doing this analysis of the help
text, the detection of SDL is currently broken, see:
https://bugzilla.redhat.com/show_bug.cgi?id=1790902
QEMU should provide a way via the QMP interface instead. A simple way,
without introducing additional commands, is to make the DisplayType
enum entries conditional, so that the enum only contains the entries if
the corresponding CONFIG_xxx switches have been set. This of course
only gives an indication which possibilities have been enabled during
compile-time of QEMU (and does not take into account whether modules
are later available or not for example - for this we'd need a separate
command), but anyway, this should already be good enough for the above
bug ticket, and it's a good idea anyway to make the QMP interface
conditional here, so let's simply do it.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210615090439.70926-1-thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2021-06-15 11:04:39 +02:00
|
|
|
'egl-headless': { 'type': 'DisplayEGLHeadless',
|
2021-08-04 10:31:05 +02:00
|
|
|
'if': { 'all': ['CONFIG_OPENGL', 'CONFIG_GBM'] } }
|
ui: Make the DisplayType enum entries conditional
Libvirt's "domcapabilities" command has a way to state whether certain
graphic frontends are available in QEMU or not. Originally, libvirt
looked at the "--help" output of the QEMU binary to determine whether
SDL was available or not (by looking for the "-sdl" parameter in the
help text), but since libvirt stopped doing this analysis of the help
text, the detection of SDL is currently broken, see:
https://bugzilla.redhat.com/show_bug.cgi?id=1790902
QEMU should provide a way via the QMP interface instead. A simple way,
without introducing additional commands, is to make the DisplayType
enum entries conditional, so that the enum only contains the entries if
the corresponding CONFIG_xxx switches have been set. This of course
only gives an indication which possibilities have been enabled during
compile-time of QEMU (and does not take into account whether modules
are later available or not for example - for this we'd need a separate
command), but anyway, this should already be good enough for the above
bug ticket, and it's a good idea anyway to make the QMP interface
conditional here, so let's simply do it.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210615090439.70926-1-thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2021-06-15 11:04:39 +02:00
|
|
|
}
|
|
|
|
}
|
2018-11-22 08:16:13 +01:00
|
|
|
|
|
|
|
##
|
|
|
|
# @query-display-options:
|
|
|
|
#
|
|
|
|
# Returns information about display configuration
|
|
|
|
#
|
|
|
|
# Returns: @DisplayOptions
|
|
|
|
#
|
|
|
|
# Since: 3.1
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'command': 'query-display-options',
|
|
|
|
'returns': 'DisplayOptions' }
|
2021-03-16 08:58:45 +01:00
|
|
|
|
|
|
|
##
|
|
|
|
# @DisplayReloadType:
|
|
|
|
#
|
|
|
|
# Available DisplayReload types.
|
|
|
|
#
|
|
|
|
# @vnc: VNC display
|
|
|
|
#
|
|
|
|
# Since: 6.0
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'enum': 'DisplayReloadType',
|
|
|
|
'data': ['vnc'] }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @DisplayReloadOptionsVNC:
|
|
|
|
#
|
|
|
|
# Specify the VNC reload options.
|
|
|
|
#
|
|
|
|
# @tls-certs: reload tls certs or not.
|
|
|
|
#
|
|
|
|
# Since: 6.0
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'struct': 'DisplayReloadOptionsVNC',
|
|
|
|
'data': { '*tls-certs': 'bool' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @DisplayReloadOptions:
|
|
|
|
#
|
|
|
|
# Options of the display configuration reload.
|
|
|
|
#
|
|
|
|
# @type: Specify the display type.
|
|
|
|
#
|
|
|
|
# Since: 6.0
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'union': 'DisplayReloadOptions',
|
|
|
|
'base': {'type': 'DisplayReloadType'},
|
|
|
|
'discriminator': 'type',
|
|
|
|
'data': { 'vnc': 'DisplayReloadOptionsVNC' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @display-reload:
|
|
|
|
#
|
|
|
|
# Reload display configuration.
|
|
|
|
#
|
|
|
|
# Returns: Nothing on success.
|
|
|
|
#
|
|
|
|
# Since: 6.0
|
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
#
|
|
|
|
# -> { "execute": "display-reload",
|
|
|
|
# "arguments": { "type": "vnc", "tls-certs": true } }
|
|
|
|
# <- { "return": {} }
|
|
|
|
#
|
|
|
|
##
|
|
|
|
{ 'command': 'display-reload',
|
|
|
|
'data': 'DisplayReloadOptions',
|
|
|
|
'boxed' : true }
|