From: Peter Maydell Date: Thu, 22 Jan 2015 12:14:19 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150122-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b3a4755a67a52aa7297eb8927b482d09dabdefec;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150122-1' into staging vnc: add support for multiple vnc displays # gpg: Signature made Thu 22 Jan 2015 11:00:54 GMT using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-vnc-20150122-1: monitor: add vnc websockets monitor: add query-vnc-servers command vnc: factor out qmp_query_client_list vnc: track & limit connections vnc: update docs/multiseat.txt vnc: allow binding servers to qemu consoles vnc: switch to QemuOpts, allow multiple servers vnc: add display id to acl names vnc: remove unused DisplayState parameter, add id instead. vnc: remove vnc_display global Signed-off-by: Peter Maydell --- b3a4755a67a52aa7297eb8927b482d09dabdefec