mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vnc: correct missing property about vnc_display

Browse Source 
Missing three property for vnc socket connection,
revalue display variable with correct way.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gonglei 2015-01-30 10:14:35 +08:00 committed by Gerd Hoffmann
parent 88428b7a93
commit e2a11d9d5a
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/vnc.c
View File

@ -3316,10 +3316,15 @@ void vnc_display_open(const char *id, Error **errp)
{ {
VncDisplay *vs = vnc_display_find(id); VncDisplay *vs = vnc_display_find(id);
QemuOpts *opts = qemu_opts_find(&qemu_vnc_opts, id); QemuOpts *opts = qemu_opts_find(&qemu_vnc_opts, id);
const char *display, *share, *device_id; const char *share, *device_id;
QemuConsole *con; QemuConsole *con;
int password = 0; int password = 0;
int reverse = 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 #ifdef CONFIG_VNC_WS
const char *websocket; const char *websocket;
#endif #endif
@ -3345,10 +3350,21 @@ void vnc_display_open(const char *id, Error **errp)
if (!opts) { if (!opts) {
return; return;
} }
display = qemu_opt_get(opts, "vnc"); vnc = qemu_opt_get(opts, "vnc");
if (!display || strcmp(display, "none") == 0) { if (!vnc || strcmp(vnc, "none") == 0) {
return; 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); vs->display = g_strdup(display);
password = qemu_opt_get_bool(opts, "password", false); 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 */ #endif /* CONFIG_VNC_WS */
} }
g_free(to);
g_free(display);
g_free(vs->display); g_free(vs->display);
vs->display = dpy; vs->display = dpy;
qemu_set_fd_handler2(vs->lsock, NULL, qemu_set_fd_handler2(vs->lsock, NULL,
@ -3642,6 +3660,8 @@ void vnc_display_open(const char *id, Error **errp)
return; return;
fail: fail:
g_free(to);
g_free(display);
g_free(vs->display); g_free(vs->display);
vs->display = NULL; vs->display = NULL;
#ifdef CONFIG_VNC_WS #ifdef CONFIG_VNC_WS