[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 20/31] vl: Clean up error reporting in machine_s
From: |
Marc-André Lureau |
Subject: |
Re: [Qemu-devel] [PATCH 20/31] vl: Clean up error reporting in machine_set_property() |
Date: |
Tue, 9 Oct 2018 15:18:08 +0400 |
Hi
On Mon, Oct 8, 2018 at 9:47 PM Markus Armbruster <address@hidden> wrote:
>
> Calling error_report() in a function that takes an Error ** argument
> is suspicious. machine_set_property() 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.
>
> Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
> ---
> vl.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index ecb70f87d8..3adc9dbe4f 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2676,7 +2676,7 @@ static int machine_set_property(void *opaque,
> g_free(qom_name);
>
> if (local_err) {
> - error_report_err(local_err);
> + error_propagate(errp, local_err);
> return -1;
> }
>
> @@ -4201,11 +4201,8 @@ int main(int argc, char **argv, char **envp)
> }
>
> machine_opts = qemu_get_machine_opts();
> - if (qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
> - NULL)) {
> - object_unref(OBJECT(current_machine));
> - exit(1);
> - }
> + qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
> + &error_fatal);
>
> configure_accelerator(current_machine);
>
> --
> 2.17.1
>
>
--
Marc-André Lureau
- [Qemu-devel] [PATCH 01/31] Use error_fatal to simplify obvious fatal errors (again), (continued)
- [Qemu-devel] [PATCH 01/31] Use error_fatal to simplify obvious fatal errors (again), Markus Armbruster, 2018/10/08
- [Qemu-devel] [PATCH 05/31] vfio: Clean up error reporting after previous commit, Markus Armbruster, 2018/10/08
- [Qemu-devel] [PATCH 04/31] vfio: Use warn_report() & friends to report warnings, Markus Armbruster, 2018/10/08
- [Qemu-devel] [PATCH 20/31] vl: Clean up error reporting in machine_set_property(), Markus Armbruster, 2018/10/08
- [Qemu-devel] [PATCH 19/31] vl: Clean up error reporting in parse_add_fd(), Markus Armbruster, 2018/10/08
- [Qemu-devel] [PATCH 12/31] l2tpv3: Improve -netdev/netdev_add/-net/... error reporting, Markus Armbruster, 2018/10/08
- [Qemu-devel] [PATCH 16/31] seccomp: Clean up error reporting in parse_sandbox(), Markus Armbruster, 2018/10/08