Commit 612aea20 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

vnc: Clean up error reporting in vnc_init_func() 



Calling error_report() in a function that takes an Error ** argument
is suspicious.  vnc_init_func() does that, and then fails without
setting an error.  Its caller main(), via qemu_opts_foreach(), is fine
with it, but clean it up anyway.

While there, drop a "Failed to start VNC server: " error message
prefix that doesn't really add value.

Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20181017082702.5581-28-armbru@redhat.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent ab4f931e

ui/vnc.c

+4 −4
Original line number Diff line number Diff line
@@ -4082,13 +4082,13 @@ int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp) 
    assert(id);

    vnc_display_init(id, &local_err);

    if (local_err) {

        error_report_err(local_err);

        exit(1);

        error_propagate(errp, local_err);

        return -1;

    }

    vnc_display_open(id, &local_err);

    if (local_err != NULL) {

        error_reportf_err(local_err, "Failed to start VNC server: ");

        exit(1);

        error_propagate(errp, local_err);

        return -1;

    }

    return 0;

}

vl.c

+1 −1
Original line number Diff line number Diff line
@@ -4527,7 +4527,7 @@ int main(int argc, char **argv, char **envp) 
    /* init remote displays */

#ifdef CONFIG_VNC

    qemu_opts_foreach(qemu_find_opts("vnc"),

                      vnc_init_func, NULL, NULL);

                      vnc_init_func, NULL, &error_fatal);

#endif



    if (using_spice) {