commit: Use bdrv_append() in commit_start()
PATCH 1/1 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 Alberto Garcia <[email protected]>
--- block/commit.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
block/commit.c +1 -10
@@ -304,23 +304,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. */
Signature · 1 line
2.11.0
ping
Quoted 39 lines · Alberto Garcia
This function combines
bdrv_set_backing_hd()andbdrv_replace_node()so we can use it to simplify the code a bit incommit_start().Signed-off-by Alberto Garcia <[email protected]>--- block/commit.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)block/commit.c +1
-10@@ -304,23 +304,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. */ Signature · 1 line
2.11.0
Max Reitz
AppliedQuoted 7 lines · Alberto Garcia
This function combines
bdrv_set_backing_hd()andbdrv_replace_node()so we can use it to simplify the code a bit incommit_start().Signed-off-by Alberto Garcia <[email protected]>--- block/commit.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
Thanks, applied to my block branch:
https://git.xanclic.moe/XanClic/qemu/commits/branch/block
Max