From patchwork Tue Jan 26 14:07:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 8123311 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 774449F1C0 for ; Tue, 26 Jan 2016 14:18:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A4F1320259 for ; Tue, 26 Jan 2016 14:18:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ADF4C20256 for ; Tue, 26 Jan 2016 14:18:12 +0000 (UTC) Received: from localhost ([::1]:44248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO4Rg-00008D-1h for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jan 2016 09:18:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO4Hh-0006hu-32 for qemu-devel@nongnu.org; Tue, 26 Jan 2016 09:07:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO4HZ-0002vY-2K for qemu-devel@nongnu.org; Tue, 26 Jan 2016 09:07:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO4HY-0002vN-Qd for qemu-devel@nongnu.org; Tue, 26 Jan 2016 09:07:44 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 7E8D8C0ED41D for ; Tue, 26 Jan 2016 14:07:44 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-40.ams2.redhat.com [10.36.116.40]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0QE7fBO009375; Tue, 26 Jan 2016 09:07:43 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id E14D080C52; Tue, 26 Jan 2016 15:07:39 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 26 Jan 2016 15:07:32 +0100 Message-Id: <1453817255-10287-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1453817255-10287-1-git-send-email-kraxel@redhat.com> References: <1453817255-10287-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Marcelo Tosatti , Markus Armbruster , Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2 2/5] qapi: switch x-input-send-event from console to device+head X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Daniel P. Berrange Reviewed-by: Eric Blake --- qapi-schema.json | 32 +++++++++++++++++--------------- qmp-commands.hx | 17 +++++++++-------- ui/input.c | 15 ++++++++++----- 3 files changed, 36 insertions(+), 28 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index b3038b2..f87189b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3775,24 +3775,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 @@ -3802,7 +3802,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..9925fc1 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -4614,8 +4614,9 @@ Send input event to guest. Arguments: -- "console": console index. (json-int, optional) -- "events": list of input events. +- "device": display device (json-str, optional) +- "head": display head (json-int, optional) +- "events": list of input events The consoles are visible in the qom tree, under /backend/console[$index]. They have a device link and head property, so @@ -4628,15 +4629,15 @@ Example (1): Press left mouse button. -> { "execute": "x-input-send-event", - "arguments": { "console": 0, + "arguments": { "device": "video0", "events": [ { "type": "btn", - "data" : { "down": true, "button": "Left" } } ] } } + "data" : { "down": true, "button": "Left" } } ] } } <- { "return": {} } -> { "execute": "x-input-send-event", - "arguments": { "console": 0, + "arguments": { "device": "video0", "events": [ { "type": "btn", - "data" : { "down": false, "button": "Left" } } ] } } + "data" : { "down": false, "button": "Left" } } ] } } <- { "return": {} } Example (2): @@ -4644,7 +4645,7 @@ Example (2): Press ctrl-alt-del. -> { "execute": "x-input-send-event", - "arguments": { "console": 0, "events": [ + "arguments": { "events": [ { "type": "key", "data" : { "down": true, "key": {"type": "qcode", "data": "ctrl" } } }, { "type": "key", "data" : { "down": true, @@ -4658,7 +4659,7 @@ Example (3): Move mouse pointer to absolute coordinates (20000, 400). -> { "execute": "x-input-send-event" , - "arguments": { "console": 0, "events": [ + "arguments": { "events": [ { "type": "abs", "data" : { "axis": "X", "value" : 20000 } }, { "type": "abs", "data" : { "axis": "Y", "value" : 400 } } ] } } <- { "return": {} } diff --git a/ui/input.c b/ui/input.c index 1409e01..755b90a 100644 --- a/ui/input.c +++ b/ui/input.c @@ -118,17 +118,22 @@ qemu_input_find_handler(uint32_t mask, QemuConsole *con) return NULL; } -void qmp_x_input_send_event(bool has_console, int64_t console, +void qmp_x_input_send_event(bool has_device, const char *device, + bool has_head, int64_t head, InputEventList *events, Error **errp) { InputEventList *e; QemuConsole *con; + Error *err = NULL; con = NULL; - if (has_console) { - con = qemu_console_lookup_by_index(console); - if (!con) { - error_setg(errp, "console %" PRId64 " not found", console); + if (has_device) { + if (!has_head) { + head = 0; + } + con = qemu_console_lookup_by_device_name(device, head, &err); + if (err) { + error_propagate(errp, err); return; } }