Google Git
Sign in
qemu / qemu / b44486dfb9447c88e4b216e730adcc780190852c
commitb44486dfb9447c88e4b216e730adcc780190852c[log] [tgz]
authorPeter Maydell <peter.maydell@linaro.org>Tue Jan 10 14:52:34 2017 +0000
committerPeter Maydell <peter.maydell@linaro.org>Tue Jan 10 14:52:34 2017 +0000
treedc17dcf2e0ef260cb411cc90f8216fb96f7e150a
parent41a0e54756a9ae6b60be34bb33302a7e085fdb07 [diff]
parente934644126f214a99bb3b3201f73fe7f0c579ef7 [diff]
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170110-1' into staging

gtk,vnc: misc bugfixes.
kbd: add jp keys, fix ps2 regressions.
sdl: export window id for baum, remove sdl hooks from baum.
egl: egl-helpers.c license change.

# gpg: Signature made Tue 10 Jan 2017 07:16:05 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/pull-ui-20170110-1:
  ps2: Fix lost scancodes by recent changes
  curses: Fix compiler warnings (Mingw-w64 redefinition of macro KEY_EVENT)
  ui/vnc: Fix problem with sending too many bytes as server name
  gtk: avoid oob array access
  egl-helpers: Change file licensing to LGPLv2
  sdl2: set window ID
  console: move window ID code from baum to sdl
  console: add API to get underlying gui window ID
  ui: use evdev keymap when running under wayland
  ui/gtk: fix crash at startup when no console is available

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
tree: dc17dcf2e0ef260cb411cc90f8216fb96f7e150a
  1. audio/
  2. backends/
  3. block/
  4. bsd-user/
  5. contrib/
  6. crypto/
  7. default-configs/
  8. disas/
  9. docs/
  10. fpu/
  11. fsdev/
  12. gdb-xml/
  13. hw/
  14. include/
  15. io/
  16. libdecnumber/
  17. linux-headers/
  18. linux-user/
  19. migration/
  20. nbd/
  21. net/
  22. pc-bios/
  23. po/
  24. qapi/
  25. qga/
  26. qobject/
  27. qom/
  28. replay/
  29. roms/
  30. scripts/
  31. slirp/
  32. stubs/
  33. target/
  34. tcg/
  35. tests/
  36. trace/
  37. ui/
  38. util/
  39. dtc
  40. pixman
  41. .dir-locals.el
  42. .exrc
  43. .gitignore
  44. .gitmodules
  45. .mailmap
  46. .travis.yml
  47. accel.c
  48. aio-posix.c
  49. aio-win32.c
  50. arch_init.c
  51. async.c
  52. atomic_template.h
  53. balloon.c
  54. block.c
  55. blockdev-nbd.c
  56. blockdev.c
  57. blockjob.c
  58. bootdevice.c
  59. bt-host.c
  60. bt-vhci.c
  61. Changelog
  62. CODING_STYLE
  63. configure
  64. COPYING
  65. COPYING.LIB
  66. cpu-exec-common.c
  67. cpu-exec.c
  68. cpus-common.c
  69. cpus.c
  70. cputlb.c
  71. device-hotplug.c
  72. device_tree.c
  73. disas.c
  74. dma-helpers.c
  75. dump.c
  76. exec.c
  77. gdbstub.c
  78. HACKING
  79. hmp-commands-info.hx
  80. hmp-commands.hx
  81. hmp.c
  82. hmp.h
  83. iohandler.c
  84. ioport.c
  85. iothread.c
  86. kvm-all.c
  87. kvm-stub.c
  88. LICENSE
  89. main-loop.c
  90. MAINTAINERS
  91. Makefile
  92. Makefile.objs
  93. Makefile.target
  94. memory.c
  95. memory_ldst.inc.c
  96. memory_mapping.c
  97. module-common.c
  98. monitor.c
  99. numa.c
  100. os-posix.c
  101. os-win32.c
  102. page_cache.c
  103. qapi-schema.json
  104. qdev-monitor.c
  105. qdict-test-data.txt
  106. qemu-bridge-helper.c
  107. qemu-char.c
  108. qemu-doc.texi
  109. qemu-ga.texi
  110. qemu-img-cmds.hx
  111. qemu-img.c
  112. qemu-img.texi
  113. qemu-io-cmds.c
  114. qemu-io.c
  115. qemu-nbd.c
  116. qemu-nbd.texi
  117. qemu-option-trace.texi
  118. qemu-options-wrapper.h
  119. qemu-options.h
  120. qemu-options.hx
  121. qemu-seccomp.c
  122. qemu-tech.texi
  123. qemu-timer.c
  124. qemu.nsi
  125. qemu.sasl
  126. qmp.c
  127. qtest.c
  128. README
  129. replication.c
  130. replication.h
  131. rules.mak
  132. softmmu_template.h
  133. spice-qemu-char.c
  134. tcg-runtime.c
  135. tci.c
  136. thread-pool.c
  137. thunk.c
  138. tpm.c
  139. trace-events
  140. translate-all.c
  141. translate-all.h
  142. translate-common.c
  143. user-exec.c
  144. VERSION
  145. version.rc
  146. vl.c
  147. xen-common-stub.c
  148. xen-common.c
  149. xen-hvm-stub.c
  150. xen-hvm.c
  151. xen-mapcache.c