From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 10 Mar 2015 19:28:09 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150310-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=21025c29f5cc716cea8a8865d96fa259acbd4d47;p=qemu.git

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

vnc bugfixes.

# gpg: Signature made Tue Mar 10 10:37:51 2015 GMT 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-20150310-1:
  Fix crash when connecting to VNC through websocket
  vnc: -readconfig fix
  vnc: set id at parse time not init time

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

21025c29f5cc716cea8a8865d96fa259acbd4d47