[Qemu-commits] [qemu/qemu] 8ea9c8: ui: fix mixup between qnum and qcode in SDL1 key h...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8ea9c80a19da93e93852ab61434b1a33fcbaa97a
      
https://github.com/qemu/qemu/commit/8ea9c80a19da93e93852ab61434b1a33fcbaa97a
  Author: Daniel P. Berrangé <address@hidden>
  Date:   2018-02-02 (Fri, 02 Feb 2018)

  Changed paths:
    M ui/sdl.c

  Log Message:
  -----------
  ui: fix mixup between qnum and qcode in SDL1 key handling

The previous commit:

  commit 2ec78706d188df7d3dab43d07b19b05ef7800a44
  Author: Daniel P. Berrange <address@hidden>
  Date:   Wed Jan 17 16:47:15 2018 +0000

    ui: convert GTK and SDL1 frontends to keycodemapdb

changed the x_keymap.c keymap so that its target was qcodes instead of
qnums. It updated the GTK frontend to take account of this change, but
forgot to update the SDL1 frontend. Thus the SDL frontend was getting
qcodes but dispatching them as if they were qnums. IOW, keyboard input
was completely hosed with SDL1. Since the keyboard layout tables are
still all based on qnums, it is easier to just keep SDL1 using qnums as
it will be deleted in a few releases time.

Reported-by: BALATON Zoltan <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
Tested-by: BALATON Zoltan <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 13e1d0e71e78a925848258391a6e616b6b5ae219
      
https://github.com/qemu/qemu/commit/13e1d0e71e78a925848258391a6e616b6b5ae219
  Author: Daniel P. Berrange <address@hidden>
  Date:   2018-02-02 (Fri, 02 Feb 2018)

  Changed paths:
    M ui/vnc.c
    M ui/vnc.h

  Log Message:
  -----------
  ui: convert VNC server to QIONetListener

The VNC server already has the ability to listen on multiple sockets.
Converting it to use the QIONetListener APIs though, will reduce the
amount of code in the VNC server and improve the clarity of what is
left.

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 627ebec208a8809818589e17f4fce55a59420ad2
      
https://github.com/qemu/qemu/commit/627ebec208a8809818589e17f4fce55a59420ad2
  Author: Daniel P. Berrangé <address@hidden>
  Date:   2018-02-02 (Fri, 02 Feb 2018)

  Changed paths:
    M ui/vnc-auth-sasl.c

  Log Message:
  -----------
  ui: correctly advance output buffer when writing SASL data

In this previous commit:

  commit 8f61f1c5a6bc06438a1172efa80bc7606594fa07
  Author: Daniel P. Berrange <address@hidden>
  Date:   Mon Dec 18 19:12:20 2017 +0000

    ui: track how much decoded data we consumed when doing SASL encoding

I attempted to fix a flaw with tracking how much data had actually been
processed when encoding with SASL. With that flaw, the VNC server could
mistakenly discard queued data that had not been sent.

The fix was not quite right though, because it merely decremented the
vs->output.offset value. This is effectively discarding data from the
end of the pending output buffer. We actually need to discard data from
the start of the pending output buffer. We also want to free memory that
is no longer required. The correct way to handle this is to use the
buffer_advance() helper method instead of directly manipulating the
offset value.

Reported-by: Laszlo Ersek <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: f24ee107a07f093bd7ed475dd48d7ba57ea3d8fe
      
https://github.com/qemu/qemu/commit/f24ee107a07f093bd7ed475dd48d7ba57ea3d8fe
  Author: Peter Maydell <address@hidden>
  Date:   2018-02-02 (Fri, 02 Feb 2018)

  Changed paths:
    M ui/sdl.c
    M ui/vnc-auth-sasl.c
    M ui/vnc.c
    M ui/vnc.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180202-pull-request' 
into staging

ui: use QIONetListener in vnc, bugfixes for sdl1 and vnc.

# gpg: Signature made Fri 02 Feb 2018 07:17:36 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20180202-pull-request:
  ui: correctly advance output buffer when writing SASL data
  ui: convert VNC server to QIONetListener
  ui: fix mixup between qnum and qcode in SDL1 key handling

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/fb2516ef94b8...f24ee107a07f