Commit 6a634199 authored by Alberto Garcia's avatar Alberto Garcia Committed by Max Reitz
Browse files

commit: Use bdrv_append() in commit_start() 



This function combines bdrv_set_backing_hd() and bdrv_replace_node()
so we can use it to simplify the code a bit in commit_start().

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Message-id: 20190403143748.9790-1-berto@igalia.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 0b3ca76e

block/commit.c

+1 −10
Original line number Diff line number Diff line
@@ -303,23 +303,14 @@ void commit_start(const char *job_id, BlockDriverState *bs, 
    commit_top_bs->total_sectors = top->total_sectors;

    bdrv_set_aio_context(commit_top_bs, bdrv_get_aio_context(top));



    bdrv_set_backing_hd(commit_top_bs, top, &local_err);

    bdrv_append(commit_top_bs, top, &local_err);

    if (local_err) {

        bdrv_unref(commit_top_bs);

        commit_top_bs = NULL;

        error_propagate(errp, local_err);

        goto fail;

    }

    bdrv_replace_node(top, commit_top_bs, &local_err);

    if (local_err) {

        bdrv_unref(commit_top_bs);

        commit_top_bs = NULL;

        error_propagate(errp, local_err);

        goto fail;

    }



    s->commit_top_bs = commit_top_bs;

    bdrv_unref(commit_top_bs);



    /* Block all nodes between top and base, because they will

     * disappear from the chain after this operation. */