From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 18 May 2018 10:39:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180518-pull-request' into... 
X-Git-Tag: qemu-xen-4.12.0-rc1~225
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=30d9081d646cbcb37341738d19e29bf350f3dd66;p=qemu-xen.git

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180518-pull-request' into staging

ui: bugfixes, move x11 dependency to modules.

# gpg: Signature made Fri 18 May 2018 08:40:41 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-20180518-pull-request:
  sdl: Move use of surface pointer below check for whether it is NULL
  ui: add x_keymap.o to modules
  console: Avoid segfault in screendump

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

30d9081d646cbcb37341738d19e29bf350f3dd66