| Message ID | 1411999675-14533-1-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 09/29/2014 08:07 AM, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > blockdev.c | 4 +--- > qemu-img.c | 4 +--- > qemu-nbd.c | 4 +--- > 3 files changed, 3 insertions(+), 9 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com> Made superfluous in commit 4782183.
On Mon, Sep 29, 2014 at 04:07:55PM +0200, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > blockdev.c | 4 +--- > qemu-img.c | 4 +--- > qemu-nbd.c | 4 +--- > 3 files changed, 3 insertions(+), 9 deletions(-) Thanks, applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan
diff --git a/blockdev.c b/blockdev.c index ad43648..2f441c5 100644 --- a/blockdev.c +++ b/blockdev.c @@ -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); diff --git a/qemu-img.c b/qemu-img.c index ea4bbae..27b85db 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -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); } diff --git a/qemu-nbd.c b/qemu-nbd.c index fa60338..b524b34 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -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;
Signed-off-by: Markus Armbruster <armbru@redhat.com> --- blockdev.c | 4 +--- qemu-img.c | 4 +--- qemu-nbd.c | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-)