[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 27/35] vnc: Clean up error reporting in vnc_i
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v2 27/35] vnc: Clean up error reporting in vnc_init_func() |
Date: |
Tue, 16 Oct 2018 00:41:18 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 |
On 15/10/2018 13:53, Markus Armbruster wrote:
> 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.
>
> Cc: Gerd Hoffmann <address@hidden>
> Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> ui/vnc.c | 9 +++++----
> vl.c | 2 +-
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 98e3d3b1d8..fcd2744d52 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -4082,13 +4082,14 @@ 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_prepend(errp, local_err,
> + "Failed to start VNC server: ");
> + 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) {
>
- [Qemu-devel] [PATCH v2 09/35] pc: Fix machine property nvdimm-persistence error handling, (continued)
- [Qemu-devel] [PATCH v2 09/35] pc: Fix machine property nvdimm-persistence error handling, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 05/35] vfio: Use warn_report() & friends to report warnings, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 29/35] tpm: Clean up error reporting in tpm_init_tpmdev(), Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 07/35] char: Use error_printf() to print help and such, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 06/35] vfio: Clean up error reporting after previous commit, Markus Armbruster, 2018/10/15
- [Qemu-devel] [PATCH v2 27/35] vnc: Clean up error reporting in vnc_init_func(), Markus Armbruster, 2018/10/15
- Re: [Qemu-devel] [PATCH v2 27/35] vnc: Clean up error reporting in vnc_init_func(),
Philippe Mathieu-Daudé <=
[Qemu-devel] [PATCH v2 30/35] spice: Clean up error reporting in add_channel(), Markus Armbruster, 2018/10/15
[Qemu-devel] [PATCH v2 28/35] numa: Clean up error reporting in parse_numa(), Markus Armbruster, 2018/10/15
[Qemu-devel] [PATCH v2 23/35] vl: Clean up error reporting in parse_fw_cfg(), Markus Armbruster, 2018/10/15
[Qemu-devel] [PATCH v2 04/35] cpus hw target: Use warn_report() & friends to report warnings, Markus Armbruster, 2018/10/15
[Qemu-devel] [PATCH v2 16/35] xen/pt: Fix incomplete conversion to realize(), Markus Armbruster, 2018/10/15
[Qemu-devel] [PATCH v2 13/35] l2tpv3: Improve -netdev/netdev_add/-net/... error reporting, Markus Armbruster, 2018/10/15
[Qemu-devel] [PATCH v2 24/35] vl: Clean up error reporting in device_init_func(), Markus Armbruster, 2018/10/15
[Qemu-devel] [PATCH v2 31/35] fsdev: Clean up error reporting in qemu_fsdev_add(), Markus Armbruster, 2018/10/15
[Qemu-devel] [PATCH v2 26/35] ui: Convert vnc_display_init(), init_keyboard_layout() to Error, Markus Armbruster, 2018/10/15