[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/5] Strip brackets from vnc host
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 1/5] Strip brackets from vnc host |
Date: |
Wed, 20 May 2015 10:34:09 +0200 |
From: Ján Tomko <address@hidden>
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>
---
ui/vnc.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 9f8ecd0..2dccae9 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3482,7 +3482,14 @@ void vnc_display_open(const char *id, Error **errp)
h = strrchr(vnc, ':');
if (h) {
- char *host = g_strndup(vnc, h - vnc);
+ char *host;
+ size_t hlen = h - vnc;
+
+ if (vnc[0] == '[' && vnc[hlen - 1] == ']') {
+ host = g_strndup(vnc + 1, hlen - 2);
+ } else {
+ host = 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);
--
1.8.3.1
- [Qemu-devel] [PULL 0/5] vnc patch queue, Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 4/5] vnc: Tweak error when init fails, Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 3/5] vnc: Don't assert if opening unix socket fails, Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 2/5] ui: remove check for failure of qemu_acl_init(), Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 5/5] qemu-sockets: Report explicit error if unlink fails, Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 1/5] Strip brackets from vnc host,
Gerd Hoffmann <=
- Re: [Qemu-devel] [PULL 0/5] vnc patch queue, Peter Maydell, 2015/05/21