qemu-devel
[Top][All Lists]
Advanced

[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: Philippe Mathieu-Daudé
Subject: Re: [Qemu-devel] [PATCH 20/31] vl: Clean up error reporting in machine_set_property()
Date: Tue, 9 Oct 2018 08:02:04 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0

On 08/10/2018 19:31, Markus Armbruster 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: Philippe Mathieu-Daudé <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);
>  
> 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]