From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YmkZB-0000Ll-Kw for qemu-devel@nongnu.org; Mon, 27 Apr 2015 11:03:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YmkZA-0004ny-Oy for qemu-devel@nongnu.org; Mon, 27 Apr 2015 11:03:25 -0400 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 27 Apr 2015 17:03:14 +0200 Message-Id: <73fa95920a361fb45b888b367e8fdf9ff0ba1416.1430146883.git.jtomko@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2] Strip brackets from vnc host List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kraxel@redhat.com, qemu-stable@nongnu.org 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=C3=A1n Tomko Reviewed-by: Eric Blake --- v2: Fixed spacing around operators cc'd qemu-stable ui/vnc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ui/vnc.c b/ui/vnc.c index cffb5b7..f989dfb 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3482,7 +3482,14 @@ void vnc_display_open(const char *id, Error **errp= ) =20 h =3D strrchr(vnc, ':'); if (h) { - char *host =3D g_strndup(vnc, h - vnc); + char *host; + size_t hlen =3D h - vnc; + + if (vnc[0] =3D=3D '[' && vnc[hlen - 1] =3D=3D ']') { + host =3D g_strndup(vnc + 1, hlen - 2); + } else { + host =3D g_strndup(vnc, hlen); + } qemu_opt_set(sopts, "host", host, &error_abort); qemu_opt_set(wsopts, "host", host, &error_abort); qemu_opt_set(sopts, "port", h+1, &error_abort); --=20 2.0.5