[Qemu-commits] [qemu/qemu] 274c3b: Strip brackets from vnc host

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 274c3b52e10466a4771d591f6298ef61e8354ce0
      
https://github.com/qemu/qemu/commit/274c3b52e10466a4771d591f6298ef61e8354ce0
  Author: Ján Tomko <address@hidden>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  Strip brackets from vnc host

Commit v2.2.0-1530-ge556032 vnc: switch to inet_listen_opts
bypassed the use of inet_parse in inet_listen, making literal
IPv6 addresses enclosed in brackets fail:

qemu-kvm: -vnc [::1]:0: Failed to start VNC server on `(null)': address
resolution failed for [::1]:5900: Name or service not known

Strip the brackets to make it work again.

Signed-off-by: Ján Tomko <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 2b2c1a38eeaba5d8bfe92281e9e680361e09ee3b
      
https://github.com/qemu/qemu/commit/2b2c1a38eeaba5d8bfe92281e9e680361e09ee3b
  Author: Daniel P. Berrange <address@hidden>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  ui: remove check for failure of qemu_acl_init()

The qemu_acl_init() function has long since stopped being able
to return NULL, since g_malloc will abort on OOM. As such the
checks for NULL were unreachable code.

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


  Commit: 3d00ac1a2ee0294fc3d460e6013a5cdd9c73ea6c
      
https://github.com/qemu/qemu/commit/3d00ac1a2ee0294fc3d460e6013a5cdd9c73ea6c
  Author: Cole Robinson <address@hidden>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: Don't assert if opening unix socket fails

Reproducer:

$ qemu-system-x86_64 -display vnc=unix:/root/i-cant-access-you.sock
qemu-system-x86_64: iohandler.c:60: qemu_set_fd_handler2: Assertion `fd >= 0' 
failed.
Aborted (core dumped)

Signed-off-by: Cole Robinson <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: bc119048d7377ec8335ecde5946df629a1b72b46
      
https://github.com/qemu/qemu/commit/bc119048d7377ec8335ecde5946df629a1b72b46
  Author: Cole Robinson <address@hidden>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: Tweak error when init fails

Before:
qemu-system-x86_64: -display vnc=unix:/root/foo.sock: Failed to start VNC 
server on `(null)': Failed to bind socket to /root/foo.sock: Permission denied

After:
qemu-system-x86_64: -display vnc=unix:/root/foo.sock: Failed to start VNC 
server: Failed to bind socket to /root/foo.sock: Permission denied

Rather than tweak the string possibly show unix: value as well,
just drop the explicit display reporting. We already get the cli
string in the error message, that should be sufficient.

Signed-off-by: Cole Robinson <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 0ef705a2653f09c15e44a644a98b6febc761431e
      
https://github.com/qemu/qemu/commit/0ef705a2653f09c15e44a644a98b6febc761431e
  Author: Cole Robinson <address@hidden>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M util/qemu-sockets.c

  Log Message:
  -----------
  qemu-sockets: Report explicit error if unlink fails

Consider this case:

$ ls -ld ~/root-owned/
drwx--x--x. 2 root root 4096 Apr 29 12:55 /home/crobinso/root-owned/
$ ls -l ~/root-owned/foo.sock
-rwxrwxrwx. 1 crobinso crobinso 0 Apr 29 12:55 
/home/crobinso/root-owned/foo.sock

$ qemu-system-x86_64 -vnc unix:~/root-owned/foo.sock
qemu-system-x86_64: -vnc unix:/home/crobinso/root-owned/foo.sock: Failed to 
start VNC server: Failed to bind socket to /home/crobinso/root-owned/foo.sock: 
Address already in use

...which is techinically true, but the real error is that we failed to
unlink. So report it.

This may seem pathological but it's a real possibility via libvirt.

Signed-off-by: Cole Robinson <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 9e549d36e989b14423279fb991b71728a2a4ae7c
      
https://github.com/qemu/qemu/commit/9e549d36e989b14423279fb991b71728a2a4ae7c
  Author: Peter Maydell <address@hidden>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M ui/vnc.c
    M util/qemu-sockets.c

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

vnc: misc fixes.

# gpg: Signature made Wed May 20 09:32:45 2015 BST 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-20150520-1:
  qemu-sockets: Report explicit error if unlink fails
  vnc: Tweak error when init fails
  vnc: Don't assert if opening unix socket fails
  ui: remove check for failure of qemu_acl_init()
  Strip brackets from vnc host

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


Compare: https://github.com/qemu/qemu/compare/eba05e922e8e...9e549d36e989