diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-10 19:28:09 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-10 19:28:09 +0000 |
| commit | 21025c29f5cc716cea8a8865d96fa259acbd4d47 (patch) | |
| tree | 111dcf47496b63349951cff005d464a737bde1f7 /include/ui | |
| parent | 23a7a287967089d70a7e30ca4c7421674691c503 (diff) | |
| parent | b57489cfe48f9fedc10205c0494f144085733f30 (diff) | |
| download | hqemu-21025c29f5cc716cea8a8865d96fa259acbd4d47.zip hqemu-21025c29f5cc716cea8a8865d96fa259acbd4d47.tar.gz | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150310-1' into staging
vnc bugfixes.
# gpg: Signature made Tue Mar 10 10:37:51 2015 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-20150310-1:
Fix crash when connecting to VNC through websocket
vnc: -readconfig fix
vnc: set id at parse time not init time
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui')
| -rw-r--r-- | include/ui/console.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index 6e5a867..2f5b9f0 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -332,7 +332,6 @@ void vnc_display_init(const char *id); void vnc_display_open(const char *id, Error **errp); void vnc_display_add_client(const char *id, int csock, bool skipauth); char *vnc_display_local_addr(const char *id); -void vnc_auto_assign_id(QemuOptsList *olist, QemuOpts *opts); #ifdef CONFIG_VNC int vnc_display_password(const char *id, const char *password); int vnc_display_pw_expire(const char *id, time_t expires); |
