summary refs log tree commit diff stats
path: root/hw/tpm/tpm_emulator.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-01-29 15:52:27 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-01-29 15:52:27 +0000
commit30d9fefe1aca1e92c785214aa9201fd7c2287d56 (patch)
tree32a879af6663e6841245dfcc40483a7ab70f801b /hw/tpm/tpm_emulator.c
parent0d1442912b3d6591a57ee45fbf28bc91e58d9e76 (diff)
parentae6b06ab655b21c19b234ce3422f694d11a013e0 (diff)
downloadfocaccia-qemu-30d9fefe1aca1e92c785214aa9201fd7c2287d56.tar.gz
focaccia-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 'hw/tpm/tpm_emulator.c')
0 files changed, 0 insertions, 0 deletions