mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: promote input-send-event to stable

Browse Source 
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 <kraxel@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Gerd Hoffmann 2016-01-12 12:39:33 +01:00
parent 01df51432e
commit 6575ccddf4
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qapi-schema.json
View File

@ -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' ] } }

14
qmp-commands.hx
View File

@ -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 } } ] } }

6
ui/input.c
View File

@ -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;