aboutsummaryrefslogtreecommitdiff
path: root/qemu-coroutine-sleep.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-03-19 12:12:21 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-03-19 12:12:21 +0000
commit1cfa7e0ab223198b8b5449508d37613003d954a4 (patch)
tree299e90f9627c341399b31986ca42e06efa8e5847 /qemu-coroutine-sleep.c
parent2259c16dc21aa55cd3fbc26f9be602949105d249 (diff)
parent4a48aaa9f52dbac148be24f591de2f28c58ccb5d (diff)
downloadqemu-1cfa7e0ab223198b8b5449508d37613003d954a4.zip
qemu-1cfa7e0ab223198b8b5449508d37613003d954a4.tar.gz
qemu-1cfa7e0ab223198b8b5449508d37613003d954a4.tar.bz2
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150318-1' into staging
vnc: fix websockets & QMP. # gpg: Signature made Wed Mar 18 13:12:35 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-20150318-1: ui: ensure VNC websockets server checks the ACL if requested ui: remove separate gnutls_session for websockets server ui: enforce TLS when using websockets server ui: fix setup of VNC websockets auth scheme with TLS ui: split setup of VNC auth scheme into separate method ui: report error if user requests VNC option that is unsupported ui: replace printf() calls with VNC_DEBUG ui: remove unused 'wiremode' variable in VncState struct vnc: Fix QMP change not to use funky error class Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-coroutine-sleep.c')
0 files changed, 0 insertions, 0 deletions