diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-02-24 12:07:28 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-02-24 12:07:28 +0000 |
| commit | 3dd2d1a33976a7ec4aa3a6a29e5183af53949237 (patch) | |
| tree | b7cdbd7c0c002a6e5aa8f0033f5a4520d0386649 /include | |
| parent | bf2fd13af3925f3a081fdeab8e8a1c8830431e46 (diff) | |
| parent | 9e0ff75e5158c7dbb65ee447382bbdf4cafbef8b (diff) | |
| download | qemu-3dd2d1a33976a7ec4aa3a6a29e5183af53949237.zip qemu-3dd2d1a33976a7ec4aa3a6a29e5183af53949237.tar.gz qemu-3dd2d1a33976a7ec4aa3a6a29e5183af53949237.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150216-1' into staging
vnc: fixup some QemuOpts conversion fallout.
# gpg: Signature made Mon Feb 16 08:13:32 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-20150216-1:
vnc: fix coverity warning
ui/vnc: optimize full scanline updates
vnc: auto assian an id when calling change vnc qmp interface
vnc: introduce an wrapper for auto assign vnc id
vnc: using bool type instead of int for QEMU_OPT_BOOL
vnc: correct missing property about vnc_display
vnc: fix qemu crash when not configure vnc option
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/console.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index 8a4d671..5c19c3c 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -335,6 +335,7 @@ 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); |