Commit 08e83aab authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Remove bdrv_move_feature_fields() 



bdrv_move_feature_fields() and swap_feature_fields() are empty now, they
can be removed.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Acked-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 7ca7f0f6

block.c

+0 −30
Original line number Diff line number Diff line
@@ -2210,13 +2210,6 @@ void bdrv_close_all(void) 
    }

}



/* Fields that need to stay with the top-level BDS */

static void bdrv_move_feature_fields(BlockDriverState *bs_dest,

                                     BlockDriverState *bs_src)

{

    /* move some fields that need to stay attached to the device */

}



static void change_parent_backing_link(BlockDriverState *from,

                                       BlockDriverState *to)

{
@@ -2240,16 +2233,6 @@ static void change_parent_backing_link(BlockDriverState *from, 
    }

}



static void swap_feature_fields(BlockDriverState *bs_top,

                                BlockDriverState *bs_new)

{

    BlockDriverState tmp;



    bdrv_move_feature_fields(&tmp, bs_top);

    bdrv_move_feature_fields(bs_top, bs_new);

    bdrv_move_feature_fields(bs_new, &tmp);

}



/*

 * Add new bs contents at the top of an image chain while the chain is

 * live, while keeping required fields on the top layer.
@@ -2273,9 +2256,6 @@ void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top) 


    bdrv_ref(bs_top);



    /* Some fields always stay on top of the backing file chain */

    swap_feature_fields(bs_top, bs_new);



    change_parent_backing_link(bs_top, bs_new);

    bdrv_set_backing_hd(bs_new, bs_top);

    bdrv_unref(bs_top);
@@ -2292,16 +2272,6 @@ void bdrv_replace_in_backing_chain(BlockDriverState *old, BlockDriverState *new) 


    bdrv_ref(old);



    if (old->blk) {

        /* As long as these fields aren't in BlockBackend, but in the top-level

         * BlockDriverState, it's not possible for a BDS to have two BBs.

         *

         * We really want to copy the fields from old to new, but we go for a

         * swap instead so that pointers aren't duplicated and cause trouble.

         * (Also, bdrv_swap() used to do the same.) */

        assert(!new->blk);

        swap_feature_fields(old, new);

    }

    change_parent_backing_link(old, new);



    /* Change backing files if a previously independent node is added to the