block: Drop superfluous conditionals around g_free()

Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>

block/curl.c

@@ -440,11 +440,9 @@ static void curl_detach_aio_context(BlockDriverState *bs)
             curl_easy_cleanup(s->states[i].curl);
             s->states[i].curl = NULL;
         }
-        if (s->states[i].orig_buf) {
         g_free(s->states[i].orig_buf);
         s->states[i].orig_buf = NULL;
     }
-    }
     if (s->multi) {
         curl_multi_cleanup(s->multi);
         s->multi = NULL;
@@ -638,7 +636,6 @@ static void curl_readv_bh_cb(void *p)
     acb->end = (acb->nb_sectors * SECTOR_SIZE);
 
     state->buf_off = 0;
-    if (state->orig_buf)
     g_free(state->orig_buf);
     state->buf_start = start;
     state->buf_len = acb->end + s->readahead_size;

block/iscsi.c

@@ -1434,9 +1434,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
 
 out:
     qemu_opts_del(opts);
-    if (initiator_name != NULL) {
     g_free(initiator_name);
-    }
     if (iscsi_url != NULL) {
         iscsi_destroy_url(iscsi_url);
     }

hw/block/onenand.c

@@ -335,10 +335,8 @@ static inline int onenand_prog_spare(OneNANDState *s, int sec, int secn,
                                     dp, 1) < 0;
             }
         }
-        if (dp) {
         g_free(dp);
     }
-    }
     return result;
 }