On 25.06.2020 18:21, Max Reitz wrote:
> bdrv_set_backing_hd() is a function that explicitly cares about the
> bs->backing child. Highlight that in its description and use
> child_bs(bs->backing) instead of backing_bs(bs) to make it more obvious.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
> block.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/block.c b/block.c
> index f3e2aae49c..d139ffb57d 100644
> --- a/block.c
> +++ b/block.c
> @@ -2846,7 +2846,7 @@ static BdrvChildRole bdrv_backing_role(BlockDriverState *bs)
> }
>
> /*
> - * Sets the backing file link of a BDS. A new reference is created; callers
> + * Sets the bs->backing link of a BDS. A new reference is created; callers
> * which don't need their own reference any more must call bdrv_unref().
> */
> void bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backing_hd,
> @@ -2855,7 +2855,7 @@ void bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backing_hd,
> bool update_inherits_from = bdrv_chain_contains(bs, backing_hd) &&
> bdrv_inherits_from_recursive(backing_hd, bs);
>
> - if (bdrv_is_backing_chain_frozen(bs, backing_bs(bs), errp)) {
> + if (bdrv_is_backing_chain_frozen(bs, child_bs(bs->backing), errp)) {
> return;
> }
>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>