| commit | 29b2517ac79ecd42c169248668e4007dee90dc5a | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Wed, 3 Aug 2016 17:22:51 +0000 (3 18:22 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Wed, 3 Aug 2016 17:22:51 +0000 (3 18:22 +0100) | ||
| tree | d5b0926ed82e0c57866d82abe5169e6c716a43c0 | treesnapshot (tar.gz zip) |
| parent | 6eac5f7bad6cd8f56b3514ac485dd35d79abff66 | commitdiff |
| parent | 12e29b1682e0a50ed57c324152addb585ae5ce69 | commitdiff |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20160803-1' into staging
vnc: fixes for "-vnc none".
# gpg: Signature made Wed 03 Aug 2016 16:33:07 BST
# 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-vnc-20160803-1:
vnc: ensure connection sharing/limits is always configured
vnc: fix crash when vnc_server_info_get has an error
vnc: don't crash getting server info if lsock is NULL
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
vnc: fixes for "-vnc none".
# gpg: Signature made Wed 03 Aug 2016 16:33:07 BST
# 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-vnc-20160803-1:
vnc: ensure connection sharing/limits is always configured
vnc: fix crash when vnc_server_info_get has an error
vnc: don't crash getting server info if lsock is NULL
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>