From patchwork Tue Jan 12 12:29:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 566535 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F29A314010F for ; Tue, 12 Jan 2016 23:31:48 +1100 (AEDT) Received: from localhost ([::1]:59583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIy70-0001g6-Qn for incoming@patchwork.ozlabs.org; Tue, 12 Jan 2016 07:31:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIy56-0006jq-J0 for qemu-devel@nongnu.org; Tue, 12 Jan 2016 07:29:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIy54-0007n0-Sk for qemu-devel@nongnu.org; Tue, 12 Jan 2016 07:29:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39827) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIy54-0007mv-Ln for qemu-devel@nongnu.org; Tue, 12 Jan 2016 07:29:46 -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 5486C349E71 for ; Tue, 12 Jan 2016 12:29:46 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-29.ams2.redhat.com [10.36.116.29]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0CCTjsY010693; Tue, 12 Jan 2016 07:29:45 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id EAC0981CB2; Tue, 12 Jan 2016 13:29:42 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 12 Jan 2016 13:29:39 +0100 Message-Id: <1452601779-5790-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1452601779-5790-1-git-send-email-kraxel@redhat.com> References: <1452601779-5790-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: Marcelo Tosatti , Markus Armbruster , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 7/7] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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 35ef71c..a0b6963 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3738,7 +3738,7 @@ 'abs' : 'InputMoveEvent' } } ## -# @x-input-send-event +# @input-send-event # # Send input event(s) to guest. # @@ -3759,16 +3759,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: experimental 2.2, stable 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 b9154b5..e02d2f2 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -4601,13 +4601,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. @@ -4628,13 +4628,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" } } ] } } @@ -4644,7 +4644,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" } } }, @@ -4658,7 +4658,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 755b90a..c630c46 100644 --- a/ui/input.c +++ b/ui/input.c @@ -118,9 +118,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;