qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [PATCH] ui/vnc: fix enabling of VNC_FEATURE_XVP
Date: Mon, 25 Sep 2023 16:43:57 +0100	[thread overview]
Message-ID: <ZRGqvdAa8OGTpH9t@redhat.com> (raw)
In-Reply-To: <20230925145034.530623-1-pbonzini@redhat.com>

On Mon, Sep 25, 2023 at 04:50:34PM +0200, Paolo Bonzini wrote:
> VNC_FEATURE_XVP was not shifted left before adding it to vs->features,
> so it was never enabled.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  ui/vnc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

/facepalm

I definitely tested this code, because I had to use QEMU to
validate the GTK-VNC client implementation....


> 
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 6fd86996a54..3d13757b72b 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -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;

....I made the same screwup when processing messages:


    case VNC_MSG_CLIENT_XVP:
        if (!(vs->features & VNC_FEATURE_XVP)) {
            error_report("vnc: xvp client message while disabled");
            vnc_client_error(vs);
            break;
        }

so the bugs (kinda) cancelled out. So you'll need to fix
both places

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|



  reply	other threads:[~2023-09-25 15:44 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-25 14:50 [PATCH] ui/vnc: fix enabling of VNC_FEATURE_XVP Paolo Bonzini
2023-09-25 15:43 ` Daniel P. Berrangé [this message]
2023-09-25 15:58   ` Paolo Bonzini
  -- strict thread matches above, loose matches on Subject: below --
2023-09-25 14:50 Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZRGqvdAa8OGTpH9t@redhat.com \
    --to=berrange@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).