Hi,
One QMP fix from Markus, needs to go into 2.3 because it is a API fix.
A bunch of websocket fixes from Daniel, with some cleanup work. The
problems fixed are serious enouth that I don't want delay this to 2.4
even though there are some non-trivial changes in the vnc websockets
code.
please pull,
Gerd
The following changes since commit 5a4992834daec85c3913654903fb9f4f954e585a:
Merge remote-tracking branch 'remotes/armbru/tags/pull-cov-model-2015-03-17'
into staging (2015-03-17 11:43:00 +0000)
are available in the git repository at:
git://git.kraxel.org/qemu tags/pull-vnc-20150318-1
for you to fetch changes up to 4a48aaa9f52dbac148be24f591de2f28c58ccb5d:
ui: ensure VNC websockets server checks the ACL if requested (2015-03-18
09:25:14 +0100)
----------------------------------------------------------------
vnc: fix websockets & QMP.
----------------------------------------------------------------
Daniel P. Berrange (8):
ui: remove unused 'wiremode' variable in VncState struct
ui: replace printf() calls with VNC_DEBUG
ui: report error if user requests VNC option that is unsupported
ui: split setup of VNC auth scheme into separate method
ui: fix setup of VNC websockets auth scheme with TLS
ui: enforce TLS when using websockets server
ui: remove separate gnutls_session for websockets server
ui: ensure VNC websockets server checks the ACL if requested
Markus Armbruster (1):
vnc: Fix QMP change not to use funky error class
ui/vnc-auth-vencrypt.c | 1 -
ui/vnc-tls.c | 72 +++++-------
ui/vnc-tls.h | 7 --
ui/vnc-ws.c | 46 ++++----
ui/vnc-ws.h | 2 +-
ui/vnc.c | 289 +++++++++++++++++++++++++++++--------------------
ui/vnc.h | 9 +-
7 files changed, 223 insertions(+), 203 deletions(-)
