From 54eb59d668d6e4e7584188628ca44f3e9bd39d17 Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Fri, 30 May 2025 17:11:07 +0200 Subject: block: drop wrapper for bdrv_set_backing_hd_drained() Nearly all callers (outside of the tests) are already using the _drained() variant of the function. It doesn't seem worth keeping. Simply adapt the remaining callers of bdrv_set_backing_hd() and rename bdrv_set_backing_hd_drained() to bdrv_set_backing_hd(). Signed-off-by: Fiona Ebner Message-ID: <20250530151125.955508-31-f.ebner@proxmox.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/commit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'block/commit.c') diff --git a/block/commit.c b/block/commit.c index c9690a5da0..7496cf732e 100644 --- a/block/commit.c +++ b/block/commit.c @@ -566,8 +566,8 @@ int bdrv_commit(BlockDriverState *bs) bdrv_graph_rdunlock_main_loop(); bdrv_graph_wrlock_drained(); - bdrv_set_backing_hd_drained(commit_top_bs, backing_file_bs, &error_abort); - bdrv_set_backing_hd_drained(bs, commit_top_bs, &error_abort); + bdrv_set_backing_hd(commit_top_bs, backing_file_bs, &error_abort); + bdrv_set_backing_hd(bs, commit_top_bs, &error_abort); bdrv_graph_wrunlock(); bdrv_graph_rdlock_main_loop(); @@ -649,7 +649,7 @@ ro_cleanup: bdrv_graph_rdunlock_main_loop(); bdrv_graph_wrlock_drained(); if (bdrv_cow_bs(bs) != backing_file_bs) { - bdrv_set_backing_hd_drained(bs, backing_file_bs, &error_abort); + bdrv_set_backing_hd(bs, backing_file_bs, &error_abort); } bdrv_graph_wrunlock(); bdrv_graph_rdlock_main_loop(); -- cgit 1.4.1