OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vnc: Clean up error reporting in vnc_init_func()

Browse Source 
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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20181017082702.5581-28-armbru@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Markus Armbruster 2018-10-17 10:26:51 +02:00
parent ab4f931e9f
commit 612aea2017
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/vnc.c
View File

@ -4082,13 +4082,13 @@ int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp)
assert(id); assert(id);
vnc_display_init(id, &local_err); vnc_display_init(id, &local_err);
if (local_err) { if (local_err) {
error_report_err(local_err); error_propagate(errp, local_err);
exit(1); return -1;
} }
vnc_display_open(id, &local_err); vnc_display_open(id, &local_err);
if (local_err != NULL) { if (local_err != NULL) {
error_reportf_err(local_err, "Failed to start VNC server: "); error_propagate(errp, local_err);
exit(1); return -1;
} }
return 0; return 0;
} }

2
vl.c
View File

@ -4527,7 +4527,7 @@ int main(int argc, char **argv, char **envp)
/* init remote displays */ /* init remote displays */
#ifdef CONFIG_VNC #ifdef CONFIG_VNC
qemu_opts_foreach(qemu_find_opts("vnc"), qemu_opts_foreach(qemu_find_opts("vnc"),
vnc_init_func, NULL, NULL); vnc_init_func, NULL, &error_fatal);
#endif #endif
if (using_spice) { if (using_spice) {