diff options
| author | Markus Armbruster <armbru@redhat.com> | 2014-12-03 11:28:02 +0100 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2014-12-10 11:27:02 +0300 |
| commit | 4ad608803c46c0acc09114a2e8352742ffd20b6b (patch) | |
| tree | 0f2aca0ff6db0daf0d8add3e205a2308ecbdc4fd | |
| parent | 7251711472a8b406640a62f25f860628d3056bb1 (diff) | |
Drop superfluous conditionals around qemu_opts_del()
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | hw/core/qdev.c | 4 | ||||
| -rw-r--r-- | qemu-char.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 35fd00d26c..901f289860 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 a8b01da3ee..ef84b53681 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); } |