diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-22 12:14:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-22 12:14:19 +0000 |
| commit | b3a4755a67a52aa7297eb8927b482d09dabdefec (patch) | |
| tree | 623503a073eed8dd52936c7d4fc66be943dafc01 /qemu-timer.c | |
| parent | a805ca54015bd123e2bc2454ec59619d0ed106c2 (diff) | |
| parent | 4478aa768ccefcc5b234c23d035435fd71b932f6 (diff) | |
| download | focaccia-qemu-b3a4755a67a52aa7297eb8927b482d09dabdefec.tar.gz focaccia-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 'qemu-timer.c')
0 files changed, 0 insertions, 0 deletions