diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2014-11-25 14:54:17 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-25 17:03:31 +0000 |
| commit | df5b2adb7398d71016ee469f71e52075ed95e04e (patch) | |
| tree | d0f753ee292ce751983e3b363944d157d83c0362 | |
| parent | ca6028185d19d3f2bd331c15175c3ef5afc30c77 (diff) | |
| download | qemu-df5b2adb7398d71016ee469f71e52075ed95e04e.tar.gz | |
input: move input-send-event into experimental namespace
Ongoing discussions on how we are going to specify the console,
so tag the command as experiental so we can refine things in
the 2.3 development cycle.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1416923657-10614-1-git-send-email-armbru@redhat.com
[Spell out "not a stable API", and x- the QAPI schema, too]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Amos Kong <akong@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | qapi-schema.json | 6 | ||||
| -rw-r--r-- | qmp-commands.hx | 16 | ||||
| -rw-r--r-- | ui/input.c | 4 |
3 files changed, 15 insertions, 11 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index d0926d95f6..9ffdcf8e85 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3245,7 +3245,7 @@ 'abs' : 'InputMoveEvent' } } ## -# @input-send-event +# @x-input-send-event # # Send input event(s) to guest. # @@ -3257,8 +3257,10 @@ # # Since: 2.2 # +# Note: this command is experimental, and not a stable API. +# ## -{ 'command': 'input-send-event', +{ 'command': 'x-input-send-event', 'data': { '*console':'int', 'events': [ 'InputEvent' ] } } ## diff --git a/qmp-commands.hx b/qmp-commands.hx index 8812401b67..718dd92f6a 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3791,13 +3791,13 @@ Example: EQMP { - .name = "input-send-event", + .name = "x-input-send-event", .args_type = "console:i?,events:q", - .mhandler.cmd_new = qmp_marshal_input_input_send_event, + .mhandler.cmd_new = qmp_marshal_input_x_input_send_event, }, SQMP -@input-send-event +@x-input-send-event ----------------- Send input event to guest. @@ -3811,17 +3811,19 @@ The consoles are visible in the qom tree, under /backend/console[$index]. They have a device link and head property, so it is possible to map which console belongs to which device and display. +Note: this command is experimental, and not a stable API. + Example (1): Press left mouse button. --> { "execute": "input-send-event", +-> { "execute": "x-input-send-event", "arguments": { "console": 0, "events": [ { "type": "btn", "data" : { "down": true, "button": "Left" } } } } <- { "return": {} } --> { "execute": "input-send-event", +-> { "execute": "x-input-send-event", "arguments": { "console": 0, "events": [ { "type": "btn", "data" : { "down": false, "button": "Left" } } } } @@ -3831,7 +3833,7 @@ Example (2): Press ctrl-alt-del. --> { "execute": "input-send-event", +-> { "execute": "x-input-send-event", "arguments": { "console": 0, "events": [ { "type": "key", "data" : { "down": true, "key": {"type": "qcode", "data": "ctrl" } } }, @@ -3845,7 +3847,7 @@ Example (3): Move mouse pointer to absolute coordinates (20000, 400). --> { "execute": "input-send-event" , +-> { "execute": "x-input-send-event" , "arguments": { "console": 0, "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 37ff46fc55..7ba99e56b1 100644 --- a/ui/input.c +++ b/ui/input.c @@ -122,8 +122,8 @@ qemu_input_find_handler(uint32_t mask, QemuConsole *con) return NULL; } -void qmp_input_send_event(bool has_console, int64_t console, - InputEventList *events, Error **errp) +void qmp_x_input_send_event(bool has_console, int64_t console, + InputEventList *events, Error **errp) { InputEventList *e; QemuConsole *con; |