[Qemu-commits] [qemu/qemu] 9634f4: vnc: set id at parse time not init time

[GitHub]

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

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

  Log Message:
  -----------
  vnc: set id at parse time not init time

This way the generated id will be stored in -writeconfig cfg files.
Also we can make vnc_auto_assign_id() local to vnc.c.

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


  Commit: 006decd448ae3ce04f12e2bbdd3079ba74d25c89
      
https://github.com/qemu/qemu/commit/006decd448ae3ce04f12e2bbdd3079ba74d25c89
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vnc: -readconfig fix

Now that -vnc goes through QemuOpts we can get vnc configuration
via -readconfig too.  So setting display_remote in the command
line parsing code doesn't cut it any more, we must check QemuOpts
instead to see whenever any vnc display is configured.

Reported-by: Markus Armbruster <address@hidden>
Tested-by: Markus Armbruster <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: b57489cfe48f9fedc10205c0494f144085733f30
      
https://github.com/qemu/qemu/commit/b57489cfe48f9fedc10205c0494f144085733f30
  Author: Jorge Acereda Maciá <address@hidden>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M ui/vnc-ws.c

  Log Message:
  -----------
  Fix crash when connecting to VNC through websocket

Connecting to VNC through websocket crashes in vnc_flush() when trying
to acquire a mutex that hasn't been initialized (vnc_init_state(vs)
hasn't been called at this point).

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


  Commit: 21025c29f5cc716cea8a8865d96fa259acbd4d47
      
https://github.com/qemu/qemu/commit/21025c29f5cc716cea8a8865d96fa259acbd4d47
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

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

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

vnc bugfixes.

# gpg: Signature made Tue Mar 10 10:37:51 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-20150310-1:
  Fix crash when connecting to VNC through websocket
  vnc: -readconfig fix
  vnc: set id at parse time not init time

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


Compare: https://github.com/qemu/qemu/compare/23a7a2879670...21025c29f5cc