| Message ID | 1402071912-17924-1-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 06/06/2014 10:25 AM, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > block/curl.c | 9 +++------ > block/iscsi.c | 4 +--- > hw/block/onenand.c | 4 +--- > 3 files changed, 5 insertions(+), 12 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
On Fri, Jun 06, 2014 at 06:25:12PM +0200, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > block/curl.c | 9 +++------ > block/iscsi.c | 4 +--- > hw/block/onenand.c | 4 +--- > 3 files changed, 5 insertions(+), 12 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
On Fri, Jun 06, 2014 at 06:25:12PM +0200, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > block/curl.c | 9 +++------ > block/iscsi.c | 4 +--- > hw/block/onenand.c | 4 +--- > 3 files changed, 5 insertions(+), 12 deletions(-) Thanks, applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan
diff --git a/block/curl.c b/block/curl.c index f491b0b..6498fd6 100644 --- a/block/curl.c +++ b/block/curl.c @@ -599,8 +599,7 @@ 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); + g_free(state->orig_buf); state->buf_start = start; state->buf_len = acb->end + s->readahead_size; end = MIN(start + state->buf_len, s->len) - 1; @@ -648,10 +647,8 @@ static void curl_close(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; - } + g_free(s->states[i].orig_buf); + s->states[i].orig_buf = NULL; } if (s->multi) curl_multi_cleanup(s->multi); diff --git a/block/iscsi.c b/block/iscsi.c index 3892cc5..865b338 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1398,9 +1398,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, out: qemu_opts_del(opts); - if (initiator_name != NULL) { - g_free(initiator_name); - } + g_free(initiator_name); if (iscsi_url != NULL) { iscsi_destroy_url(iscsi_url); } diff --git a/hw/block/onenand.c b/hw/block/onenand.c index 60d5311..5388122 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -335,9 +335,7 @@ static inline int onenand_prog_spare(OneNANDState *s, int sec, int secn, dp, 1) < 0; } } - if (dp) { - g_free(dp); - } + g_free(dp); } return result; }
Signed-off-by: Markus Armbruster <armbru@redhat.com> --- block/curl.c | 9 +++------ block/iscsi.c | 4 +--- hw/block/onenand.c | 4 +--- 3 files changed, 5 insertions(+), 12 deletions(-)