From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNH0Z-0002bw-PW for qemu-devel@nongnu.org; Mon, 16 Feb 2015 03:26:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNH0X-0007wa-I2 for qemu-devel@nongnu.org; Mon, 16 Feb 2015 03:26:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNH0X-0007wM-AZ for qemu-devel@nongnu.org; Mon, 16 Feb 2015 03:26:21 -0500 From: Gerd Hoffmann Date: Mon, 16 Feb 2015 09:26:00 +0100 Message-Id: <1424075165-25016-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1424075165-25016-1-git-send-email-kraxel@redhat.com> References: <1424075165-25016-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 2/7] vnc: correct missing property about vnc_display List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei , Gerd Hoffmann , Anthony Liguori From: Gonglei Missing three property for vnc socket connection, revalue display variable with correct way. Signed-off-by: Gonglei Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 90e8a88..6a82d7f 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3316,10 +3316,15 @@ void vnc_display_open(const char *id, Error **errp) { VncDisplay *vs = vnc_display_find(id); QemuOpts *opts = qemu_opts_find(&qemu_vnc_opts, id); - const char *display, *share, *device_id; + const char *share, *device_id; QemuConsole *con; int password = 0; int reverse = 0; + const char *vnc; + const char *has_to; + char *display, *to = NULL; + bool has_ipv4 = false; + bool has_ipv6 = false; #ifdef CONFIG_VNC_WS const char *websocket; #endif @@ -3345,10 +3350,21 @@ void vnc_display_open(const char *id, Error **errp) if (!opts) { return; } - display = qemu_opt_get(opts, "vnc"); - if (!display || strcmp(display, "none") == 0) { + vnc = qemu_opt_get(opts, "vnc"); + if (!vnc || strcmp(vnc, "none") == 0) { return; } + + has_to = qemu_opt_get(opts, "to"); + if (has_to) { + to = g_strdup_printf(",to=%s", has_to); + } + has_ipv4 = qemu_opt_get_bool(opts, "ipv4", false); + has_ipv6 = qemu_opt_get_bool(opts, "ipv6", false); + display = g_strdup_printf("%s%s%s%s", vnc, + has_to ? to : "", + has_ipv4 ? ",ipv4" : "", + has_ipv6 ? ",ipv6" : ""); vs->display = g_strdup(display); password = qemu_opt_get_bool(opts, "password", false); @@ -3628,6 +3644,8 @@ void vnc_display_open(const char *id, Error **errp) } #endif /* CONFIG_VNC_WS */ } + g_free(to); + g_free(display); g_free(vs->display); vs->display = dpy; qemu_set_fd_handler2(vs->lsock, NULL, @@ -3642,6 +3660,8 @@ void vnc_display_open(const char *id, Error **errp) return; fail: + g_free(to); + g_free(display); g_free(vs->display); vs->display = NULL; #ifdef CONFIG_VNC_WS -- 1.8.3.1