[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 27/38] vnc: Clean up error reporting in vnc_init_
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v4 27/38] vnc: Clean up error reporting in vnc_init_func() |
Date: |
Wed, 17 Oct 2018 10:26:51 +0200 |
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 <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
ui/vnc.c | 8 ++++----
vl.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 98e3d3b1d8..0c1b477425 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -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;
}
diff --git a/vl.c b/vl.c
index c053117028..8e0006d49c 100644
--- a/vl.c
+++ b/vl.c
@@ -4526,7 +4526,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) {
--
2.17.1
- [Qemu-devel] [PATCH v4 03/38] block: Use warn_report() & friends to report warnings, (continued)
- [Qemu-devel] [PATCH v4 18/38] vl: Clean up error reporting in parse_add_fd(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 11/38] smbios: Clean up error handling in smbios_add(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 20/38] vl: Clean up error reporting in chardev_init_func(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 15/38] numa: Fix QMP command set-numa-node error handling, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 13/38] l2tpv3: Improve -netdev/netdev_add/-net/... error reporting, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 22/38] vl: Clean up error reporting in mon_init_func(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 27/38] vnc: Clean up error reporting in vnc_init_func(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v4 21/38] vl: Clean up error reporting in machine_set_property(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 06/38] vfio: Clean up error reporting after previous commit, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 19/38] qom: Clean up error reporting in user_creatable_add_opts_foreach(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 23/38] vl: Clean up error reporting in parse_fw_cfg(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 24/38] vl: Clean up error reporting in device_init_func(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 28/38] numa: Clean up error reporting in parse_numa(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 30/38] spice: Clean up error reporting in add_channel(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 33/38] blockdev: Convert drive_new() to Error, Markus Armbruster, 2018/10/17