Skip to contentSkip to conversation

block: Drop superfluous conditionals around qemu_opts_del()

PATCH Applied Markus Armbruster 3 participants 3 messages Sep 29, 2014 – Sep 30, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block: Drop superfluous conditionals around qemu_opts_del()

---
 blockdev.c | 4 +---
 qemu-img.c | 4 +---
 qemu-nbd.c | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)
blockdev.c +1 -3
index ad43648..2f441c5 100644
@@ -224,9 +224,7 @@ void drive_info_del(DriveInfo *dinfo)
     if (!dinfo) {
         return;
     }
-    if (dinfo->opts) {
-        qemu_opts_del(dinfo->opts);
-    }
+    qemu_opts_del(dinfo->opts);
     g_free(dinfo->id);
     QTAILQ_REMOVE(&drives, dinfo, next);
     g_free(dinfo->serial);
qemu-img.c +1 -3
index ea4bbae..27b85db 100644
@@ -1736,9 +1736,7 @@ out:
     qemu_opts_del(opts);
     qemu_opts_free(create_opts);
     qemu_vfree(buf);
-    if (sn_opts) {
-        qemu_opts_del(sn_opts);
-    }
+    qemu_opts_del(sn_opts);
     if (out_bs) {
         bdrv_unref(out_bs);
     }
qemu-nbd.c +1 -3
index fa60338..b524b34 100644
@@ -778,9 +778,7 @@ int main(int argc, char **argv)
         unlink(sockpath);
     }
 
-    if (sn_opts) {
-        qemu_opts_del(sn_opts);
-    }
+    qemu_opts_del(sn_opts);
 
     if (device) {
         void *ret;
Signature · 1 line
1.9.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Markus Armbruster
---
 blockdev.c | 4 +---
 qemu-img.c | 4 +---
 qemu-nbd.c | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

Made superfluous in commit 4782183.

Signature · 2 lines
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org