diff mbox

Drop superfluous conditionals around qemu_opts_del()

Message ID 1417602482-8832-1-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster Dec. 3, 2014, 10:28 a.m. UTC 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/core/qdev.c | 4 +---
 qemu-char.c    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

Comments

Paolo Bonzini Dec. 3, 2014, 10:30 a.m. UTC | #1 
On 03/12/2014 11:28, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  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 <pbonzini@redhat.com>
Gonglei (Arei) Dec. 3, 2014, 10:33 a.m. UTC | #2 
On 2014/12/3 18:28, Markus Armbruster wrote:

> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  hw/core/qdev.c | 4 +---
>  qemu-char.c    | 4 +---
>  2 files changed, 2 insertions(+), 6 deletions(-)
> 

Reviewed-by: Gonglei <arei.gonglei@huawei.com>

> 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);
>  }
>
Michael Tokarev Dec. 10, 2014, 8:27 a.m. UTC | #3 
Applied to -trivial, thank you!

/mjt
diff mbox

Patch

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);
 }