diff options
| author | Peter Maydell | 2018-01-29 16:52:27 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-01-29 16:52:27 +0100 |
| commit | 30d9fefe1aca1e92c785214aa9201fd7c2287d56 (patch) | |
| tree | 32a879af6663e6841245dfcc40483a7ab70f801b /ui/input-keymap.c | |
| parent | Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st... (diff) | |
| parent | hw: convert virtio-input-hid device to keycodemapdb (diff) | |
| download | qemu-30d9fefe1aca1e92c785214aa9201fd7c2287d56.tar.gz qemu-30d9fefe1aca1e92c785214aa9201fd7c2287d56.tar.xz qemu-30d9fefe1aca1e92c785214aa9201fd7c2287d56.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/input-20180129-v2-pull-request' into staging
input: switch devices to keycodemapdb, bugfixes.
# gpg: Signature made Mon 29 Jan 2018 10:23:00 GMT
# 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/input-20180129-v2-pull-request:
hw: convert virtio-input-hid device to keycodemapdb
ui: fix alphabetical ordering of keymaps
hw: convert the escc device to keycodemapdb
hw: convert ps2 device to keycodemapdb
ps2: check PS2Queue pointers in post_load routine
input: virtio: don't send mouse wheel event twice
input: add mouse side buttons to virtio input
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input-keymap.c')
| -rw-r--r-- | ui/input-keymap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 95b1e0cbfa..3d4e66bab5 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -7,9 +7,13 @@ #include "ui/input-keymap-atset1-to-qcode.c" #include "ui/input-keymap-linux-to-qcode.c" +#include "ui/input-keymap-qcode-to-atset1.c" +#include "ui/input-keymap-qcode-to-atset2.c" +#include "ui/input-keymap-qcode-to-atset3.c" +#include "ui/input-keymap-qcode-to-linux.c" #include "ui/input-keymap-qcode-to-qnum.c" +#include "ui/input-keymap-qcode-to-sun.c" #include "ui/input-keymap-qnum-to-qcode.c" -#include "ui/input-keymap-qcode-to-linux.c" #include "ui/input-keymap-usb-to-qcode.c" #include "ui/input-keymap-win32-to-qcode.c" #include "ui/input-keymap-x11-to-qcode.c" |