diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2023-09-25 13:05:58 +0200 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2023-10-03 02:00:54 +0300 |
commit | 3b86b92bfbbebbc8f6801588dafce7d76c1782d9 (patch) | |
tree | 1b521ea08fe9abf2c80224c021876c062cc9f346 /ui | |
parent | 17f3a6221f010a95e277b88a80b6f763eafaeb0d (diff) |
ui/vnc: fix handling of VNC_FEATURE_XVP
VNC_FEATURE_XVP was not shifted left before adding it to vs->features,
so it was never enabled; but it was also checked the wrong way with
a logical AND instead of vnc_has_feature. Fix both places.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 477b301000d665313217f65e3a368d2cb7769c42)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/vnc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2205,7 +2205,7 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) break; case VNC_ENCODING_XVP: if (vs->vd->power_control) { - vs->features |= VNC_FEATURE_XVP; + vs->features |= VNC_FEATURE_XVP_MASK; send_xvp_message(vs, VNC_XVP_CODE_INIT); } break; @@ -2454,7 +2454,7 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) vnc_client_cut_text(vs, read_u32(data, 4), data + 8); break; case VNC_MSG_CLIENT_XVP: - if (!(vs->features & VNC_FEATURE_XVP)) { + if (!vnc_has_feature(vs, VNC_FEATURE_XVP)) { error_report("vnc: xvp client message while disabled"); vnc_client_error(vs); break; |