Commit d0ac0380 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Factor out should_update_child() 



Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
parent 067acf28

block.c

+27 −15
Original line number Diff line number Diff line
@@ -2886,15 +2886,14 @@ void bdrv_close_all(void) 
    assert(QTAILQ_EMPTY(&all_bdrv_states));

}



static void change_parent_backing_link(BlockDriverState *from,

                                       BlockDriverState *to)

static bool should_update_child(BdrvChild *c, BlockDriverState *to)

{

    BdrvChild *c, *next, *to_c;

    BdrvChild *to_c;



    QLIST_FOREACH_SAFE(c, &from->parents, next_parent, next) {

    if (c->role->stay_at_node) {

            continue;

        return false;

    }



    if (c->role == &child_backing) {

        /* If @from is a backing file of @to, ignore the child to avoid

         * creating a loop. We only want to change the pointer of other
@@ -2905,10 +2904,23 @@ static void change_parent_backing_link(BlockDriverState *from, 
            }

        }

        if (to_c) {

                continue;

            return false;

        }

    }



    return true;

}



static void change_parent_backing_link(BlockDriverState *from,

                                       BlockDriverState *to)

{

    BdrvChild *c, *next;



    QLIST_FOREACH_SAFE(c, &from->parents, next_parent, next) {

        if (!should_update_child(c, to)) {

            continue;

        }



        bdrv_ref(to);

        /* FIXME Are we sure that bdrv_replace_child() can't run into

         * &error_abort because of permissions? */