qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] d616cc: vnc: remove vnc_display global

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] d616cc: vnc: remove vnc_display global
Date: Thu, 22 Jan 2015 06:00:07 -0800 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d616ccc5dd771024e04b9b15d7ca30bc7fe8fce3
      
https://github.com/qemu/qemu/commit/d616ccc5dd771024e04b9b15d7ca30bc7fe8fce3
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

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

  Log Message:
  -----------
  vnc: remove vnc_display global

Replace with a vnc_displays list, so we can have multiple vnc server
instances.  Add vnc_server_find function to lookup a display by id.
With no id supplied return the first vnc server, for backward
compatibility reasons.

It is not possible (yet) to actually create multiple vnc server
instances.

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


  Commit: 14f7143ede7c601cce02ce0f8c7f01c41148128b
      
https://github.com/qemu/qemu/commit/14f7143ede7c601cce02ce0f8c7f01c41148128b
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M include/ui/console.h
    M ui/vnc.c
    M vl.c

  Log Message:
  -----------
  vnc: remove unused DisplayState parameter, add id instead.

DisplayState isn't used anywhere, drop it.  Add the vnc server ID as
parameter instead, so it is possible to specify the server instance.

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


  Commit: c8496408b443a2a34dd03ad4274c2575248aa3e8
      
https://github.com/qemu/qemu/commit/c8496408b443a2a34dd03ad4274c2575248aa3e8
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: add display id to acl names

In case the display id is "default" (which is the one you get if you
don't explicitly assign one) we keep the old name scheme, without
display, for backward compatibility reasons.

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


  Commit: 4db14629c38611061fc19ec6927405923de84f08
      
https://github.com/qemu/qemu/commit/4db14629c38611061fc19ec6927405923de84f08
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M include/ui/console.h
    M qmp.c
    M ui/vnc.c
    M vl.c

  Log Message:
  -----------
  vnc: switch to QemuOpts, allow multiple servers

This patch switches vnc over to QemuOpts, and it (more or less
as side effect) allows multiple vnc server instances.

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


  Commit: 1d0d59fe291967533f974e82213656d479475a1e
      
https://github.com/qemu/qemu/commit/1d0d59fe291967533f974e82213656d479475a1e
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: allow binding servers to qemu consoles

This patch adds a display= parameter to the vnc options.  This allows to
bind a vnc server instance to a specific display, allowing to create a
multiseat setup with a vnc server for each seat.

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


  Commit: 86fdcf23f4a9d8473844734907555b3a93ed686c
      
https://github.com/qemu/qemu/commit/86fdcf23f4a9d8473844734907555b3a93ed686c
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M docs/multiseat.txt

  Log Message:
  -----------
  vnc: update docs/multiseat.txt

vnc joins the party ;)
Also some s/head/seat/ to clarify.

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


  Commit: e5f34cdd2da54f28d90889a3afd15fad2d6105ff
      
https://github.com/qemu/qemu/commit/e5f34cdd2da54f28d90889a3afd15fad2d6105ff
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

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

  Log Message:
  -----------
  vnc: track & limit connections

Also track the number of connections in "connecting" and "shared" state
(in addition to the "exclusive" state).  Apply a configurable limit to
these connections.

The logic to apply the limit to connections in "shared" state is pretty
simple:  When the limit is reached no new connections are allowed.

The logic to apply the limit to connections in "connecting" state (this
is the state you are in *before* successful authentication) is
slightly different:  A new connect kicks out the oldest client which is
still in "connecting" state.  This avoids a easy DoS by unauthenticated
users by simply opening connections until the limit is reached.

Cc: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 2d29a4368c3c00a5cf200f29b3dfd32bc4fb2c31
      
https://github.com/qemu/qemu/commit/2d29a4368c3c00a5cf200f29b3dfd32bc4fb2c31
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: factor out qmp_query_client_list

so we can reuse it for the new vnc query command.

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


  Commit: df887684603a4b3b0c623090a6b419dc70f22c32
      
https://github.com/qemu/qemu/commit/df887684603a4b3b0c623090a6b419dc70f22c32
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M qapi-schema.json
    M qmp-commands.hx
    M ui/vnc.c

  Log Message:
  -----------
  monitor: add query-vnc-servers command

Add new query vnc qmp command, for the lack of better ideas just name it
"query-vnc-servers".  Changes over query-vnc:

 * It returns a list of vnc servers, so multiple vnc server instances
   are covered.
 * Each vnc server returns a list of server sockets.  Followup patch
   will use that to also report websockets.  In case we add support for
   multiple server sockets server sockets (to better support ipv4+ipv6
   dualstack) we can add them to the list too.

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


  Commit: 4478aa768ccefcc5b234c23d035435fd71b932f6
      
https://github.com/qemu/qemu/commit/4478aa768ccefcc5b234c23d035435fd71b932f6
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M qapi-schema.json
    M ui/vnc.c

  Log Message:
  -----------
  monitor: add vnc websockets

Add websockets bool to VncBasicInfo, report websocket server sockets,
flag websocket client connections.

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


  Commit: b3a4755a67a52aa7297eb8927b482d09dabdefec
      
https://github.com/qemu/qemu/commit/b3a4755a67a52aa7297eb8927b482d09dabdefec
  Author: Peter Maydell <address@hidden>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M docs/multiseat.txt
    M include/ui/console.h
    M qapi-schema.json
    M qmp-commands.hx
    M qmp.c
    M ui/vnc.c
    M ui/vnc.h
    M vl.c

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

vnc: add support for multiple vnc displays

# gpg: Signature made Thu 22 Jan 2015 11:00:54 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-20150122-1:
  monitor: add vnc websockets
  monitor: add query-vnc-servers command
  vnc: factor out qmp_query_client_list
  vnc: track & limit connections
  vnc: update docs/multiseat.txt
  vnc: allow binding servers to qemu consoles
  vnc: switch to QemuOpts, allow multiple servers
  vnc: add display id to acl names
  vnc: remove unused DisplayState parameter, add id instead.
  vnc: remove vnc_display global

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


Compare: https://github.com/qemu/qemu/compare/a805ca54015b...b3a4755a67a5
reply via email to
[Prev in Thread] Current Thread [Next in Thread]