mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui/vnc: disable adaptive update calculations if not needed

Browse Source 
Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Peter Lieven 2014-01-08 10:08:38 +01:00 committed by Gerd Hoffmann
parent 919372251c
commit e22492d332
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/vnc.c
View File

@ -3150,7 +3150,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
acl = 1; acl = 1;
#endif #endif
} else if (strncmp(options, "lossy", 5) == 0) { } else if (strncmp(options, "lossy", 5) == 0) {
#ifdef CONFIG_VNC_JPEG
vs->lossy = true; vs->lossy = true;
#endif
} else if (strncmp(options, "non-adaptive", 12) == 0) { } else if (strncmp(options, "non-adaptive", 12) == 0) {
vs->non_adaptive = true; vs->non_adaptive = true;
} else if (strncmp(options, "share=", 6) == 0) { } else if (strncmp(options, "share=", 6) == 0) {
@ -3167,6 +3169,13 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
} }
} }
/* adaptive updates are only used with tight encoding and
* if lossy updates are enabled so we can disable all the
* calculations otherwise */
if (!vs->lossy) {
vs->non_adaptive = true;
}
#ifdef CONFIG_VNC_TLS #ifdef CONFIG_VNC_TLS
if (acl && x509 && vs->tls.x509verify) { if (acl && x509 && vs->tls.x509verify) {
if (!(vs->tls.acl = qemu_acl_init("vnc.x509dname"))) { if (!(vs->tls.acl = qemu_acl_init("vnc.x509dname"))) {