Commit a663fbd9 authored by Chao Peng's avatar Chao Peng Committed by Eduardo Habkost
Browse files

vnc: Wrap vnc initialization code with CONFIG_VNC 



commit f8c75b24 (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: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarChao Peng <chao.p.peng@linux.intel.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent f9a8b553

vl.c

+2 −0
Original line number Diff line number Diff line
@@ -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);