summary refs log tree commit diff stats
path: root/util/async.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-05-15 12:00:23 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-05-15 12:00:23 +0100
commitc13547feeec97fb31a2283cd129549b3e8c78054 (patch)
treee42929ce964295f4463e43d5ab2b72bd000457d1 /util/async.c
parent46cc2fc4f591f30adf74cdaf63edc53a463ebbd1 (diff)
parent677b490501823c1cb6946d8bb9e7907c12cd0c71 (diff)
downloadfocaccia-qemu-c13547feeec97fb31a2283cd129549b3e8c78054.tar.gz
focaccia-qemu-c13547feeec97fb31a2283cd129549b3e8c78054.zip
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180515-pull-request' into staging
ui: qapi parser for -display cmd line.
gtk: multiple fixes.
sdl: opts bugfix.
vnc: magic cookie.

# gpg: Signature made Tue 15 May 2018 10:18:51 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# 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/ui-20180515-pull-request:
  gtk: disable the F10 menubar key
  console: use linked list for QemuConsoles
  ui: document non-qapi parser cases.
  ui: switch gtk display to qapi parser
  ui: switch trivial displays to qapi parser
  ui: add qapi parser for -display
  vnc: add magic cookie to VncState
  ui/gtk: Only try to initialize EGL/X11 if GtkGlArea failed
  gtk: make it possible to hide the menu bar
  sdl2: move opts assignment into loop

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/async.c')
0 files changed, 0 insertions, 0 deletions