diff options
| author | Peter Maydell | 2015-01-22 13:14:19 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-01-22 13:14:19 +0100 |
| commit | b3a4755a67a52aa7297eb8927b482d09dabdefec (patch) | |
| tree | 623503a073eed8dd52936c7d4fc66be943dafc01 /linux-headers | |
| parent | Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into s... (diff) | |
| parent | monitor: add vnc websockets (diff) | |
| download | qemu-b3a4755a67a52aa7297eb8927b482d09dabdefec.tar.gz qemu-b3a4755a67a52aa7297eb8927b482d09dabdefec.tar.xz qemu-b3a4755a67a52aa7297eb8927b482d09dabdefec.zip | |
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) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* 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 <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers')
0 files changed, 0 insertions, 0 deletions