diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2022-11-18 18:41:03 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2022-12-15 16:07:42 +0100 |
| commit | 631086deefc32690ee56efed1c5b891dec31ae37 (patch) | |
| tree | b43912b7f07324d91f71e32e57f99fce324c8fbc /block.c | |
| parent | d22933acd2f470eeef779e4d444e848f76dcfaf8 (diff) | |
| download | focaccia-qemu-631086deefc32690ee56efed1c5b891dec31ae37.tar.gz focaccia-qemu-631086deefc32690ee56efed1c5b891dec31ae37.zip | |
block: Don't use subtree drains in bdrv_drop_intermediate()
Instead of using a subtree drain from the top node (which also drains child nodes of base that we're not even interested in), use a normal drain for base, which automatically drains all of the parents, too. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Message-Id: <20221118174110.55183-9-kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
| -rw-r--r-- | block.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block.c b/block.c index dd329a16ce..db043346d8 100644 --- a/block.c +++ b/block.c @@ -5600,7 +5600,7 @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base, GLOBAL_STATE_CODE(); bdrv_ref(top); - bdrv_subtree_drained_begin(top); + bdrv_drained_begin(base); if (!top->drv || !base->drv) { goto exit; @@ -5673,7 +5673,7 @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base, ret = 0; exit: - bdrv_subtree_drained_end(top); + bdrv_drained_end(base); bdrv_unref(top); return ret; } |