QMP/input-send-event: make console parameter optional
The 'QemuConsole' is the input source for handler, we share some input handlers to process the input events from different QemuConsole. Normally we only have one set of keyboard, mouse, usbtablet, etc. The devices have different mask, it's fine to just checking mask to insure that the handler has the ability to process the event. I saw we try to bind console to handler in usb/dev-hid.c, but display always isn't available at that time. If we have multiseat setup (as Gerd said), we only have 'problem' in this case. Actually event from different devices have the same effect for system, it's fine to always use the first available handler without caring about the console. For send-key command, we just pass a NULL for console parameter in calling qemu_input_event_send_key(NULL, ..), but 'input-send-event' needs to care more devices. Conclusion: Generally assigning the special console is meanless, and we can't directly remove the QMP parameter for compatibility. So we can make the parameter optional. The parameter might be useful for some special condition: we have multiple devices without binding console and they all have the ability(mask) to process events, and we don't want to use the first one. Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Markus Armbruster <armbru@redhat.com> Cc: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Amos Kong <akong@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
935fb91522
commit
51fc44768a
@ -3249,7 +3249,7 @@
|
||||
#
|
||||
# Send input event(s) to guest.
|
||||
#
|
||||
# @console: Which console to send event(s) to.
|
||||
# @console: #optional console to send event(s) to.
|
||||
#
|
||||
# @events: List of InputEvent union.
|
||||
#
|
||||
@ -3259,7 +3259,7 @@
|
||||
#
|
||||
##
|
||||
{ 'command': 'input-send-event',
|
||||
'data': { 'console':'int', 'events': [ 'InputEvent' ] } }
|
||||
'data': { '*console':'int', 'events': [ 'InputEvent' ] } }
|
||||
|
||||
##
|
||||
# @NumaOptions
|
||||
|
@ -3792,7 +3792,7 @@ EQMP
|
||||
|
||||
{
|
||||
.name = "input-send-event",
|
||||
.args_type = "console:i,events:q",
|
||||
.args_type = "console:i?,events:q",
|
||||
.mhandler.cmd_new = qmp_marshal_input_input_send_event,
|
||||
},
|
||||
|
||||
@ -3804,7 +3804,7 @@ Send input event to guest.
|
||||
|
||||
Arguments:
|
||||
|
||||
- "console": console index.
|
||||
- "console": console index. (json-int, optional)
|
||||
- "events": list of input events.
|
||||
|
||||
The consoles are visible in the qom tree, under
|
||||
|
15
ui/input.c
15
ui/input.c
@ -122,16 +122,19 @@ qemu_input_find_handler(uint32_t mask, QemuConsole *con)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void qmp_input_send_event(int64_t console, InputEventList *events,
|
||||
Error **errp)
|
||||
void qmp_input_send_event(bool has_console, int64_t console,
|
||||
InputEventList *events, Error **errp)
|
||||
{
|
||||
InputEventList *e;
|
||||
QemuConsole *con;
|
||||
|
||||
con = qemu_console_lookup_by_index(console);
|
||||
if (!con) {
|
||||
error_setg(errp, "console %" PRId64 " not found", console);
|
||||
return;
|
||||
con = NULL;
|
||||
if (has_console) {
|
||||
con = qemu_console_lookup_by_index(console);
|
||||
if (!con) {
|
||||
error_setg(errp, "console %" PRId64 " not found", console);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) {
|
||||
|
Loading…
Reference in New Issue
Block a user