Re: [Qemu-devel] [PATCH 4/7] qapi: switch x-input-send-event from console to device+head

[Markus Armbruster]

Gerd Hoffmann <address@hidden> writes:

> Use display device qdev id and head number instead of console index to
> specify the QemuConsole.  This makes things consistent with input
> devices (for input routing) and vnc server configuration, which both use
> display and head too.
>
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
>  qapi-schema.json | 32 +++++++++++++++++---------------
>  qmp-commands.hx  | 15 ++++++++-------
>  ui/input.c       | 15 ++++++++++-----
>  3 files changed, 35 insertions(+), 27 deletions(-)
>
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 2e31733..3884479 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -3748,24 +3748,24 @@
>  #
>  # Send input event(s) to guest.
>  #
> -# @console: #optional console to send event(s) to.
> -#           This parameter 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.  If input routing is not
> -#           configured this parameter has no effect.
> -#           If @console is missing, only devices that aren't associated
> -#           with a console are admissible.
> -#           If @console is specified, it must exist, and both devices
> -#           associated with that console and devices not associated with a
> -#           console are admissible, but the former take precedence.
> -
> -#
> +# @device: #optional display device to send event(s) to.
> +# @head: #optional head to send event(s) to, in case the
> +#        display device supports multiple scanouts.
>  # @events: List of InputEvent union.
>  #
>  # Returns: Nothing on success.
>  #
> +# The @display 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.
> +
>  # Since: 2.2
>  #
>  # Note: this command is experimental, and not a stable API.  Things that
> @@ -3775,7 +3775,9 @@
>  #
>  ##
>  { 'command': 'x-input-send-event',
> -  'data': { '*console':'int', 'events': [ 'InputEvent' ] } }
> +  'data': { '*device': 'str',
> +            '*head'  : 'int',
> +            'events' : [ 'InputEvent' ] } }
>  
>  ##
>  # @NumaOptions
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index db072a6..bda1fa6 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -4614,7 +4614,8 @@ Send input event to guest.
>  
>  Arguments:
>  
> -- "console": console index. (json-int, optional)
> +- "device": display device. (json-str, optional)
> +- "head": display head. (json-int, optional)
>  - "events": list of input events.

Suggest to drop the periods.

[...]