diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-12 10:58:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-12 10:58:14 +0100 |
| commit | 494edbf0b499e342d466e3dea334fd6ae1d56278 (patch) | |
| tree | 0dc40068faaa7d052e7691f9ad9042eca97e55ae /hw/input/hid.c | |
| parent | 910789c220818f276fe431cdfd79f02fadc0c259 (diff) | |
| parent | 2e6a64cb8d7506ad27d3b6c8000bc8d773936932 (diff) | |
| download | qemu-494edbf0b499e342d466e3dea334fd6ae1d56278.zip qemu-494edbf0b499e342d466e3dea334fd6ae1d56278.tar.gz qemu-494edbf0b499e342d466e3dea334fd6ae1d56278.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20160712-1' into staging
msmouse: fix misc issues, switch to new input interface.
input: add trace events for full queues.
input-linux: better capability checks and event handling.
# gpg: Signature made Tue 12 Jul 2016 09:20:36 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-input-20160712-1:
input-linux: better capability checks, merge input_linux_event_{mouse, keyboard}
input-linux: factor out input_linux_handle_keyboard
input-linux: factor out input_linux_handle_mouse
input: add trace events for full queues
msmouse: send short messages if possible.
msmouse: switch to new input interface
msmouse: fix buffer handling
msmouse: add MouseState, unregister handler on close
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/input/hid.c')
| -rw-r--r-- | hw/input/hid.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/input/hid.c b/hw/input/hid.c index d92c746..5e2850e 100644 --- a/hw/input/hid.c +++ b/hw/input/hid.c @@ -27,6 +27,7 @@ #include "ui/console.h" #include "qemu/timer.h" #include "hw/input/hid.h" +#include "trace.h" #define HID_USAGE_ERROR_ROLLOVER 0x01 #define HID_USAGE_POSTFAIL 0x02 @@ -234,7 +235,7 @@ static void hid_keyboard_event(DeviceState *dev, QemuConsole *src, key->down, scancodes); if (hs->n + count > QUEUE_LENGTH) { - fprintf(stderr, "usb-kbd: warning: key event queue full\n"); + trace_hid_kbd_queue_full(); return; } for (i = 0; i < count; i++) { |