From: Peter Maydell Date: Tue, 24 Oct 2017 15:55:56 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/input-20171023-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=328f6f79e9916deb6e5649499f7439b0262f6f9e;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/input-20171023-pull-request' into staging input: fixes for ui input code and ps/2 keyboard (mostly sysrq key) # gpg: Signature made Mon 23 Oct 2017 10:19:22 BST # 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-20171023-pull-request: ui: pull in latest keycodemapdb ui: normalize the 'sysrq' key into the 'print' key ps2: fix scancodes sent for Ctrl+Pause key combination ps2: fix scancodess sent for Pause key in AT set 1 ps2: fix scancodes sent for Shift/Ctrl+Print key combination ps2: fix scancodes sent for Alt-Print key combination (aka SysRq) ui: use correct union field for key number ui: fix crash with sendkey and raw key numbers input: use hex in ps2 keycode trace events Signed-off-by: Peter Maydell --- 328f6f79e9916deb6e5649499f7439b0262f6f9e