xenbits.xensource.com Git - people/liuw/libxenctrl-split/qemu-xen.git/commitdiff

author	Peter Maydell <peter.maydell@linaro.org>
	Fri, 18 Dec 2015 16:04:31 +0000 (16:04 +0000)
committer	Peter Maydell <peter.maydell@linaro.org>
	Fri, 18 Dec 2015 16:04:31 +0000 (16:04 +0000)

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>

Trivial merge