summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Martin <github@martintribe.org>2012-05-16 12:54:25 +0000
committerDoug Goldstein <cardoe@cardoe.com>2012-11-21 15:22:01 -0600
commitcae7a173ae473e299c4c5dd81220422f3dd44f4d (patch)
tree7ef92f2fbf80d8d558d6ceac131ea34b6cde7407
parentfix entry pointer for ELF kernels loaded with -kernel option (diff)
downloadqemu-kvm-cae7a173ae473e299c4c5dd81220422f3dd44f4d.tar.gz
qemu-kvm-cae7a173ae473e299c4c5dd81220422f3dd44f4d.tar.bz2
qemu-kvm-cae7a173ae473e299c4c5dd81220422f3dd44f4d.zip
ui/vnc: Only report/use TIGHT_PNG encoding if enabled.
If TIGHT_PNG is not enabled by the --enable-vnc-png configure flag then do not report to the client that it is supported. Also, since TIGHT_PNG is the same as the TIGHT encoding but with the filter/copy replaced with PNG data, adding it to the supported encodings list when it is disabled will cause the TIGHT encoding to be used even though the client requested TIGHT_PNG. Signed-off-by: Joel Martin <github@martintribe.org> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> (cherry picked from commit fe3e7f2dc05225cdd2ba40defcd4e2581bebc5e0)
-rw-r--r--ui/vnc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/vnc.c b/ui/vnc.c
index 54bc5adab..8cec55fce 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1818,10 +1818,12 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
vs->features |= VNC_FEATURE_TIGHT_MASK;
vs->vnc_encoding = enc;
break;
+#ifdef CONFIG_VNC_PNG
case VNC_ENCODING_TIGHT_PNG:
vs->features |= VNC_FEATURE_TIGHT_PNG_MASK;
vs->vnc_encoding = enc;
break;
+#endif
case VNC_ENCODING_ZLIB:
vs->features |= VNC_FEATURE_ZLIB_MASK;
vs->vnc_encoding = enc;