Re: [Qemu-devel] [PATCH] Drop superfluous conditionals around qemu_opts_del()

[Paolo Bonzini]

On 03/12/2014 11:28, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
>  hw/core/qdev.c | 4 +---
>  qemu-char.c    | 4 +---
>  2 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index 35fd00d..901f289 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -1141,9 +1141,7 @@ static void device_finalize(Object *obj)
>      NamedGPIOList *ngl, *next;
>  
>      DeviceState *dev = DEVICE(obj);
> -    if (dev->opts) {
> -        qemu_opts_del(dev->opts);
> -    }
> +    qemu_opts_del(dev->opts);
>  
>      QLIST_FOREACH_SAFE(ngl, &dev->gpios, node, next) {
>          QLIST_REMOVE(ngl, node);
> diff --git a/qemu-char.c b/qemu-char.c
> index a8b01da..ef84b53 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -3825,9 +3825,7 @@ void qemu_chr_delete(CharDriverState *chr)
>      }
>      g_free(chr->filename);
>      g_free(chr->label);
> -    if (chr->opts) {
> -        qemu_opts_del(chr->opts);
> -    }
> +    qemu_opts_del(chr->opts);
>      g_free(chr);
>  }
>  
> 

Reviewed-by: Paolo Bonzini <address@hidden>