Merge remote-tracking branch 'remotes/berrange/tags/pull-io-channel-vnc-2015-12-18...
commitb06f904f2e37eb2a9ab0a8344faec7e5d609508a
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 18 Dec 2015 16:04:31 +0000 (18 16:04 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 18 Dec 2015 16:04:31 +0000 (18 16:04 +0000)
tree33ac8b839bb86e2f9b181beb721ee87e8fca9925
parent6126bc55220f7cde3392ef1fbbffcbc67240d4f0
parentd5f042232cca1c3e2d16b49607632fe4c0f86453
Merge remote-tracking branch 'remotes/berrange/tags/pull-io-channel-vnc-2015-12-18-1' into staging

Merge VNC conversion to I/O channels

# gpg: Signature made Fri 18 Dec 2015 15:44:30 GMT using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"

* remotes/berrange/tags/pull-io-channel-vnc-2015-12-18-1:
  ui: convert VNC server to use QIOChannelWebsock
  ui: convert VNC server to use QIOChannelTLS
  ui: convert VNC server to use QIOChannelSocket

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