From: Peter Maydell Date: Mon, 29 Jan 2018 15:52:27 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/input-20180129-v2-pull-request... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=30d9fefe1aca1e92c785214aa9201fd7c2287d56;p=qemu.git 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) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " # 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 --- 30d9fefe1aca1e92c785214aa9201fd7c2287d56