[Qemu-commits] [qemu/qemu] bf7aa4: vnc: drop display+ws_display from VncDisplay

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: bf7aa45e7b378691ea0e8616a2aeae2aaabb7bc3
      
https://github.com/qemu/qemu/commit/bf7aa45e7b378691ea0e8616a2aeae2aaabb7bc3
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

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

  Log Message:
  -----------
  vnc: drop display+ws_display from VncDisplay

Nobody cares about those strings, they are only used to check whenever
the vnc server / websocket support is enabled or not.  Add bools for
this and drop the strings.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Gonglei <address@hidden>


  Commit: fc5c3ff75135fcc02ca3453568d212241d2bc40f
      
https://github.com/qemu/qemu/commit/fc5c3ff75135fcc02ca3453568d212241d2bc40f
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: remove dead code

If vs->ws_enabled is set ws_display is non-NULL.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Gonglei <address@hidden>


  Commit: e556032960eaa403da6069aa9abf4dcaddefd710
      
https://github.com/qemu/qemu/commit/e556032960eaa403da6069aa9abf4dcaddefd710
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: switch to inet_listen_opts

Use inet_listen_opts instead of inet_listen.  Allows us to drop some
pointless indirection:  Format strings just to parse them again later on.

Signed-off-by: Gerd Hoffmann <address@hidden>
Tested-by: Gonglei <address@hidden>
Reviewed-by: Gonglei <address@hidden>


  Commit: 8c7d06457311b13bc65c9b24df5d895b2826b8c5
      
https://github.com/qemu/qemu/commit/8c7d06457311b13bc65c9b24df5d895b2826b8c5
  Author: Daniel P. Berrange <address@hidden>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  ui: fix regression in x509verify parameter for VNC server

The 'x509verify' parameter is documented as taking a path to the
x509 certificates, ie the same syntax as the 'x509' parameter.

  commit 4db14629c38611061fc19ec6927405923de84f08
  Author: Gerd Hoffmann <address@hidden>
  Date:   Tue Sep 16 12:33:03 2014 +0200

    vnc: switch to QemuOpts, allow multiple servers

caused a regression by turning 'x509verify' into a boolean
parameter instead. This breaks setup from libvirt and is not
consistent with the docs.

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


  Commit: f76b84a04b75e98eee56e8dc277564d0fbb99018
      
https://github.com/qemu/qemu/commit/f76b84a04b75e98eee56e8dc277564d0fbb99018
  Author: Gonglei <address@hidden>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M ui/console.c

  Log Message:
  -----------
  ui/console: fix OVERFLOW_BEFORE_WIDEN

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: b3c33f91732ea32e7a8391c5e61c3fc02308d822
      
https://github.com/qemu/qemu/commit/b3c33f91732ea32e7a8391c5e61c3fc02308d822
  Author: Gonglei <address@hidden>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: avoid possible file handler leak

vs->lsock may equal to 0, modify the check condition,
avoid possible vs->lsock leak.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 81607cbfa433272d1f09bd0f0ae6c3b14f818972
      
https://github.com/qemu/qemu/commit/81607cbfa433272d1f09bd0f0ae6c3b14f818972
  Author: Gonglei <address@hidden>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: fix segmentation fault when invalid vnc parameters are specified

Reproducer:
 #./qemu-system-x86_64 -vnc :0,ip
qemu-system-x86_64: -vnc :1,ip: Invalid parameter 'ip'
Segmentation fault (core dumped)

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 2a5b58e2405e9fe42ba356b5a1b78146a4e9a659
      
https://github.com/qemu/qemu/commit/2a5b58e2405e9fe42ba356b5a1b78146a4e9a659
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150312-1' into 
staging

vnc: bugfixes and cleanups.

# gpg: Signature made Thu Mar 12 08:58:39 2015 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"

* remotes/kraxel/tags/pull-vnc-20150312-1:
  vnc: fix segmentation fault when invalid vnc parameters are specified
  vnc: avoid possible file handler leak
  ui/console: fix OVERFLOW_BEFORE_WIDEN
  ui: fix regression in x509verify parameter for VNC server
  vnc: switch to inet_listen_opts
  vnc: remove dead code
  vnc: drop display+ws_display from VncDisplay

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


Compare: https://github.com/qemu/qemu/compare/a195fdd02837...2a5b58e2405e