aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChao Peng <chao.p.peng@linux.intel.com>2016-06-16 09:59:10 +0800
committerEduardo Habkost <ehabkost@redhat.com>2016-06-17 10:42:21 -0300
commita663fbd9e2f65fae81018d81f231ad79510cf9fb (patch)
tree5e6377cc87b796e3aad8a1fcecb41fbae166eee1
parentf9a8b5530d438f836f9697639814f585aaec554d (diff)
vnc: Wrap vnc initialization code with CONFIG_VNC
commit f8c75b2486 (vnc: Initialization stubs) removed CONFIG_VNC in vl.c code. However qemu_find_opts("vnc") is NULL when vnc is configured out. Crash will happen in qemu_opts_foreach() before stub vnc_init_func() is called. This patch add it back. Cc: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
-rw-r--r--vl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vl.c b/vl.c
index 0736d8430d..2f63eb448f 100644
--- a/vl.c
+++ b/vl.c
@@ -4564,8 +4564,10 @@ int main(int argc, char **argv, char **envp)
os_setup_signal_handling();
/* init remote displays */
+#ifdef CONFIG_VNC
qemu_opts_foreach(qemu_find_opts("vnc"),
vnc_init_func, NULL, NULL);
+#endif
if (show_vnc_port) {
char *ret = vnc_display_local_addr("default");
printf("VNC server running on '%s'\n", ret);