diff mbox

ui: fix regression in printing VNC host/port on startup

Message ID 1465382576-25552-1-git-send-email-berrange@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel P. Berrangé June 8, 2016, 10:42 a.m. UTC
If VNC is chosen as the compile time default display backend,
QEMU will print the host/port it listens on at startup.
Previously this would look like

  VNC server running on '::1:5900'

but in 04d2529da27db512dcbd5e99d0e26d333f16efcc the ':' was
accidentally replaced with a ';'. This the ':' back.

Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 ui/vnc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eric Blake June 8, 2016, 1:35 p.m. UTC | #1
On 06/08/2016 04:42 AM, Daniel P. Berrange wrote:
> If VNC is chosen as the compile time default display backend,
> QEMU will print the host/port it listens on at startup.
> Previously this would look like
> 
>   VNC server running on '::1:5900'
> 
> but in 04d2529da27db512dcbd5e99d0e26d333f16efcc the ':' was
> accidentally replaced with a ';'. This the ':' back.
> 
> Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  ui/vnc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/ui/vnc.c b/ui/vnc.c
> index c862fdc..75ae2a7 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -3225,7 +3225,7 @@ char *vnc_display_local_addr(const char *id)
>          qapi_free_SocketAddress(addr);
>          return NULL;
>      }
> -    ret = g_strdup_printf("%s;%s", addr->u.inet.data->host,
> +    ret = g_strdup_printf("%s:%s", addr->u.inet.data->host,
>                            addr->u.inet.data->port);
>      qapi_free_SocketAddress(addr);
>  
>
Gerd Hoffmann June 10, 2016, 9:11 a.m. UTC | #2
On Mi, 2016-06-08 at 11:42 +0100, Daniel P. Berrange wrote:
> If VNC is chosen as the compile time default display backend,
> QEMU will print the host/port it listens on at startup.
> Previously this would look like
> 
>   VNC server running on '::1:5900'
> 
> but in 04d2529da27db512dcbd5e99d0e26d333f16efcc the ':' was
> accidentally replaced with a ';'. This the ':' back.

Added to ui queue.

thanks,
  Gerd
diff mbox

Patch

diff --git a/ui/vnc.c b/ui/vnc.c
index c862fdc..75ae2a7 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3225,7 +3225,7 @@  char *vnc_display_local_addr(const char *id)
         qapi_free_SocketAddress(addr);
         return NULL;
     }
-    ret = g_strdup_printf("%s;%s", addr->u.inet.data->host,
+    ret = g_strdup_printf("%s:%s", addr->u.inet.data->host,
                           addr->u.inet.data->port);
     qapi_free_SocketAddress(addr);