Commit 8b189772 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170209-2' into staging 



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

# gpg: Signature made Thu 09 Feb 2017 16:45:02 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-ui-20170209-2:
  ui: add ability to specify multiple VNC listen addresses
  util: add iterators for QemuOpts values
  ui: let VNC server listen on all resolved IP addresses
  ui: extract code to connect/listen from vnc_display_open
  ui: refactor code for populating SocketAddress from vnc_display_open
  ui: refactor VncDisplay to allow multiple listening sockets
  ui: fix reporting of VNC auth in query-vnc-servers
  ui: fix regression handling bare 'websocket' option to -vnc
  vnc: do not disconnect on EAGAIN
  ui/vnc: Drop unused vnc_has_job() and vnc_jobs_clear()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f073cd3a 396f935a

include/qemu/option.h

+9 −0
Original line number Diff line number Diff line
@@ -100,6 +100,15 @@ typedef int (*qemu_opt_loopfunc)(void *opaque, 
int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque,

                     Error **errp);



typedef struct {

    QemuOpts *opts;

    QemuOpt *opt;

    const char *name;

} QemuOptsIter;



void qemu_opt_iter_init(QemuOptsIter *iter, QemuOpts *opts, const char *name);

const char *qemu_opt_iter_next(QemuOptsIter *iter);



QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id);

QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id,

                           int fail_if_exists, Error **errp);

qapi-schema.json

+24 −4
Original line number Diff line number Diff line
@@ -1506,7 +1506,8 @@ 
#

# The network connection information for server

#

# @auth: #optional authentication method

# @auth: #optional authentication method used for

#        the plain (non-websocket) VNC server

#

# Since: 2.1

##
@@ -1597,6 +1598,25 @@ 
            'tls-plain', 'x509-plain',

            'tls-sasl',  'x509-sasl' ] }





##

# @VncServerInfo2:

#

# The network connection information for server

#

# @auth: The current authentication type used by the servers

#

# @vencrypt: #optional The vencrypt sub authentication type used by the

#            servers, only specified in case auth == vencrypt.

#

# Since: 2.9

##

{ 'struct': 'VncServerInfo2',

  'base': 'VncBasicInfo',

  'data': { 'auth'      : 'VncPrimaryAuth',

            '*vencrypt' : 'VncVencryptSubAuth' } }





##

# @VncInfo2:

#
@@ -1612,9 +1632,9 @@ 
# @clients: A list of @VncClientInfo of all currently connected clients.

#           The list can be empty, for obvious reasons.

#

# @auth: The current authentication type used by the server

# @auth: The current authentication type used by the non-websockets servers

#

# @vencrypt: #optional The vencrypt sub authentication type used by the server,

# @vencrypt: #optional The vencrypt authentication type used by the servers,

#            only specified in case auth == vencrypt.

#

# @display: #optional The display device the vnc server is linked to.
@@ -1623,7 +1643,7 @@ 
##

{ 'struct': 'VncInfo2',

  'data': { 'id'        : 'str',

            'server'    : ['VncBasicInfo'],

            'server'    : ['VncServerInfo2'],

            'clients'   : ['VncClientInfo'],

            'auth'      : 'VncPrimaryAuth',

            '*vencrypt' : 'VncVencryptSubAuth',

qemu-options.hx

+8 −4
Original line number Diff line number Diff line
@@ -1296,10 +1296,14 @@ is a TCP port number, not a display number. 
@item websocket



Opens an additional TCP listening port dedicated to VNC Websocket connections.

By definition the Websocket port is 5700+@var{display}. If @var{host} is

specified connections will only be allowed from this host.

As an alternative the Websocket port could be specified by using

@code{websocket}=@var{port}.

If a bare @var{websocket} option is given, the Websocket port is

5700+@var{display}. An alternative port can be specified with the

syntax @code{websocket}=@var{port}.



If @var{host} is specified connections will only be allowed from this host.

It is possible to control the websocket listen address independently, using

the syntax @code{websocket}=@var{host}:@var{port}.



If no TLS credentials are provided, the websocket connection runs in

unencrypted mode. If TLS credentials are provided, the websocket connection

requires encrypted client connections.

ui/vnc-jobs.c

+0 −23
Original line number Diff line number Diff line
@@ -128,29 +128,6 @@ static bool vnc_has_job_locked(VncState *vs) 
    return false;

}



bool vnc_has_job(VncState *vs)

{

    bool ret;



    vnc_lock_queue(queue);

    ret = vnc_has_job_locked(vs);

    vnc_unlock_queue(queue);

    return ret;

}



void vnc_jobs_clear(VncState *vs)

{

    VncJob *job, *tmp;



    vnc_lock_queue(queue);

    QTAILQ_FOREACH_SAFE(job, &queue->jobs, next, tmp) {

        if (job->vs == vs || !vs) {

            QTAILQ_REMOVE(&queue->jobs, job, next);

        }

    }

    vnc_unlock_queue(queue);

}



void vnc_jobs_join(VncState *vs)

{

    vnc_lock_queue(queue);

ui/vnc-jobs.h

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 
VncJob *vnc_job_new(VncState *vs);

int vnc_job_add_rect(VncJob *job, int x, int y, int w, int h);

void vnc_job_push(VncJob *job);

bool vnc_has_job(VncState *vs);

void vnc_jobs_clear(VncState *vs);

void vnc_jobs_join(VncState *vs);



void vnc_jobs_consume_buffer(VncState *vs);