mbox

[PULL,00/10] vnc: add support for multiple listening sockets.

Message ID 1486645277-4724-1-git-send-email-kraxel@redhat.com
State New
Headers show

Pull-request

git://git.kraxel.org/qemu tags/pull-ui-20170209-1

Message

Gerd Hoffmann Feb. 9, 2017, 1:01 p.m. UTC
Hi,

Here comes the UI patch queue, carrying only vnc updates this time.  Big
chunk is the multiple sockets support patch series, but there are also
some smaller fixes and cleanups.

please pull,
  Gerd

The following changes since commit d0dff238a87fa81393ed72754d4dc8b09e50b08b:

  Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170206' into staging (2017-02-07 15:29:26 +0000)

are available in the git repository at:


  git://git.kraxel.org/qemu tags/pull-ui-20170209-1

for you to fetch changes up to 7448e761356799d4e445e6ea3891a8067233465d:

  ui: add ability to specify multiple VNC listen addresses (2017-02-08 14:59:40 +0100)

----------------------------------------------------------------
vnc: add support for multiple listening sockets.
vnc: misc fixes and cleanups.

----------------------------------------------------------------
Daniel P. Berrange (8):
      ui: fix regression handling bare 'websocket' option to -vnc
      ui: fix reporting of VNC auth in query-vnc-servers
      ui: refactor VncDisplay to allow multiple listening sockets
      ui: refactor code for populating SocketAddress from vnc_display_open
      ui: extract code to connect/listen from vnc_display_open
      ui: let VNC server listen on all resolved IP addresses
      util: add iterators for QemuOpts values
      ui: add ability to specify multiple VNC listen addresses

Michael Tokarev (1):
      vnc: do not disconnect on EAGAIN

Peter Maydell (1):
      ui/vnc: Drop unused vnc_has_job() and vnc_jobs_clear()

 include/qemu/option.h |   9 +
 qapi-schema.json      |  28 ++-
 qemu-options.hx       |  12 +-
 ui/vnc-jobs.c         |  23 --
 ui/vnc-jobs.h         |   2 -
 ui/vnc.c              | 658 +++++++++++++++++++++++++++++++++++---------------
 ui/vnc.h              |  10 +-
 util/qemu-option.c    |  19 ++
 8 files changed, 533 insertions(+), 228 deletions(-)

Comments

Peter Maydell Feb. 9, 2017, 1:15 p.m. UTC | #1
On 9 February 2017 at 13:01, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Here comes the UI patch queue, carrying only vnc updates this time.  Big
> chunk is the multiple sockets support patch series, but there are also
> some smaller fixes and cleanups.
>
> please pull,
>   Gerd
>
> The following changes since commit d0dff238a87fa81393ed72754d4dc8b09e50b08b:
>
>   Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170206' into staging (2017-02-07 15:29:26 +0000)
>
> are available in the git repository at:
>
>
>   git://git.kraxel.org/qemu tags/pull-ui-20170209-1
>
> for you to fetch changes up to 7448e761356799d4e445e6ea3891a8067233465d:
>
>   ui: add ability to specify multiple VNC listen addresses (2017-02-08 14:59:40 +0100)
>
> ----------------------------------------------------------------
> vnc: add support for multiple listening sockets.
> vnc: misc fixes and cleanups.

Build failure on clang/OSX:

/Users/pm215/src/qemu-for-merges/ui/vnc.c:3566:21: error: variable
'baseport' is used uninitialized whenever 'if' condition is false
[-Werror,-Wsometimes-uninitialized]
                if (displaynum == -1) {
                    ^~~~~~~~~~~~~~~~
/Users/pm215/src/qemu-for-merges/ui/vnc.c:3603:15: note: uninitialized
use occurs here
        ret = baseport;
              ^~~~~~~~
  CC      ui/vnc-enc-hextile.o
/Users/pm215/src/qemu-for-merges/ui/vnc.c:3566:17: note: remove the
'if' if its condition is always true
                if (displaynum == -1) {
                ^~~~~~~~~~~~~~~~~~~~~~
/Users/pm215/src/qemu-for-merges/ui/vnc.c:3564:17: error: variable
'baseport' is used uninitialized whenever 'if' condition is false
[-Werror,-Wsometimes-uninitialized]
            if (g_str_equal(addrstr, "") ||
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/pm215/src/qemu-for-merges/ui/vnc.c:3603:15: note: uninitialized
use occurs here
        ret = baseport;
              ^~~~~~~~
/Users/pm215/src/qemu-for-merges/ui/vnc.c:3564:13: note: remove the
'if' if its condition is always true
            if (g_str_equal(addrstr, "") ||
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/pm215/src/qemu-for-merges/ui/vnc.c:3533:36: note: initialize
the variable 'baseport' to silence this warning
        unsigned long long baseport;
                                   ^
                                    = 0

That's slightly confused, but what it's saying is that in
vnc_display_get_address() we don't set baseport in the
if (websocket) codepath, but we use it unconditionally.

thanks
-- PMM