From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 21 May 2015 08:07:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150520-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9e549d36e989b14423279fb991b71728a2a4ae7c;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150520-1' into staging

vnc: misc fixes.

# gpg: Signature made Wed May 20 09:32:45 2015 BST using RSA key ID D3E87138
# 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>"

* remotes/kraxel/tags/pull-vnc-20150520-1:
  qemu-sockets: Report explicit error if unlink fails
  vnc: Tweak error when init fails
  vnc: Don't assert if opening unix socket fails
  ui: remove check for failure of qemu_acl_init()
  Strip brackets from vnc host

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

9e549d36e989b14423279fb991b71728a2a4ae7c