Commit fbf28a43 authored by Markus Armbruster's avatar Markus Armbruster Committed by Stefan Hajnoczi
Browse files

block: Drop superfluous conditionals around qemu_opts_del() 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1411999675-14533-1-git-send-email-armbru@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 18fe46d7

blockdev.c

+1 −3
Original line number Diff line number Diff line
@@ -224,9 +224,7 @@ void drive_info_del(DriveInfo *dinfo) 
    if (!dinfo) {

        return;

    }

    if (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
Original line number Diff line number Diff line
@@ -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);

    }

    if (out_bs) {

        bdrv_unref(out_bs);

    }

qemu-nbd.c

+1 −3
Original line number Diff line number Diff line
@@ -778,9 +778,7 @@ int main(int argc, char **argv) 
        unlink(sockpath);

    }



    if (sn_opts) {

    qemu_opts_del(sn_opts);

    }



    if (device) {

        void *ret;