From patchwork Tue Mar 1 08:23:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 8463001 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EE440C0553 for ; Tue, 1 Mar 2016 08:23:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4622E201BB for ; Tue, 1 Mar 2016 08:23:22 +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 787162025A for ; Tue, 1 Mar 2016 08:23:21 +0000 (UTC) Received: from localhost ([::1]:41572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aafaS-0008Af-RH for patchwork-qemu-devel@patchwork.kernel.org; Tue, 01 Mar 2016 03:23:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aafaG-0008A0-20 for qemu-devel@nongnu.org; Tue, 01 Mar 2016 03:23:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aafaD-0002Vk-KH for qemu-devel@nongnu.org; Tue, 01 Mar 2016 03:23:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aafaD-0002VV-DI for qemu-devel@nongnu.org; Tue, 01 Mar 2016 03:23:05 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 1CDE7C0A9CCC for ; Tue, 1 Mar 2016 08:23:05 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-22.ams2.redhat.com [10.36.116.22]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u218N4Zd003552; Tue, 1 Mar 2016 03:23:04 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 30F9180BC4; Tue, 1 Mar 2016 09:23:02 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 1 Mar 2016 09:23:00 +0100 Message-Id: <1456820580-19156-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1456820580-19156-1-git-send-email-kraxel@redhat.com> References: <1456820580-19156-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann , Markus Armbruster Subject: [Qemu-devel] [PULL 5/5] qapi: promote input-send-event to stable 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 With all fixups being in place now, we can promote input-send-event to stable abi by removing the x- prefix. Signed-off-by: Gerd Hoffmann Reviewed-by: Markus Armbruster Reviewed-by: Eric Blake --- qapi-schema.json | 12 +++--------- qmp-commands.hx | 14 +++++++------- ui/input.c | 6 +++--- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index f3e080f..42fd61b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3819,7 +3819,7 @@ 'abs' : 'InputMoveEvent' } } ## -# @x-input-send-event +# @input-send-event # # Send input event(s) to guest. # @@ -3840,16 +3840,10 @@ # 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 -# might change before it becomes stable include the spelling of enum -# values for InputButton and InputAxis, and the notion of how to designate -# which console will receive the event. # +# Since: 2.6 ## -{ 'command': 'x-input-send-event', +{ 'command': 'input-send-event', 'data': { '*device': 'str', '*head' : 'int', 'events' : [ 'InputEvent' ] } } diff --git a/qmp-commands.hx b/qmp-commands.hx index edfe772..b629673 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -4658,13 +4658,13 @@ Example: EQMP { - .name = "x-input-send-event", + .name = "input-send-event", .args_type = "console:i?,events:q", - .mhandler.cmd_new = qmp_marshal_x_input_send_event, + .mhandler.cmd_new = qmp_marshal_input_send_event, }, SQMP -@x-input-send-event +@input-send-event ----------------- Send input event to guest. @@ -4685,13 +4685,13 @@ Example (1): Press left mouse button. --> { "execute": "x-input-send-event", +-> { "execute": "input-send-event", "arguments": { "device": "video0", "events": [ { "type": "btn", "data" : { "down": true, "button": "left" } } ] } } <- { "return": {} } --> { "execute": "x-input-send-event", +-> { "execute": "input-send-event", "arguments": { "device": "video0", "events": [ { "type": "btn", "data" : { "down": false, "button": "left" } } ] } } @@ -4701,7 +4701,7 @@ Example (2): Press ctrl-alt-del. --> { "execute": "x-input-send-event", +-> { "execute": "input-send-event", "arguments": { "events": [ { "type": "key", "data" : { "down": true, "key": {"type": "qcode", "data": "ctrl" } } }, @@ -4715,7 +4715,7 @@ Example (3): Move mouse pointer to absolute coordinates (20000, 400). --> { "execute": "x-input-send-event" , +-> { "execute": "input-send-event" , "arguments": { "events": [ { "type": "abs", "data" : { "axis": "x", "value" : 20000 } }, { "type": "abs", "data" : { "axis": "y", "value" : 400 } } ] } } diff --git a/ui/input.c b/ui/input.c index 0887bb5..6fd48ef 100644 --- a/ui/input.c +++ b/ui/input.c @@ -119,9 +119,9 @@ qemu_input_find_handler(uint32_t mask, QemuConsole *con) return NULL; } -void qmp_x_input_send_event(bool has_device, const char *device, - bool has_head, int64_t head, - InputEventList *events, Error **errp) +void qmp_input_send_event(bool has_device, const char *device, + bool has_head, int64_t head, + InputEventList *events, Error **errp) { InputEventList *e; QemuConsole *con;