Commit ab41fc48 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by John Snow
Browse files

block: remove bdrv_dirty_bitmap_make_anon 



All this function is doing will be repeated by
bdrv_do_release_matching_dirty_bitmap_locked, except
resetting bm->persistent.  But even that does not matter
because the bitmap will be freed.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 20180323164254.26487-1-pbonzini@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 2afc4e3d

block/dirty-bitmap.c

+0 −9
Original line number Diff line number Diff line
@@ -97,15 +97,6 @@ BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs, const char *name) 
    return NULL;

}



/* Called with BQL taken.  */

void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap)

{

    assert(!bdrv_dirty_bitmap_frozen(bitmap));

    g_free(bitmap->name);

    bitmap->name = NULL;

    bitmap->persistent = false;

}



/* Called with BQL taken.  */

BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,

                                          uint32_t granularity,

blockdev.c

+0 −1
Original line number Diff line number Diff line
@@ -2881,7 +2881,6 @@ void qmp_block_dirty_bitmap_remove(const char *node, const char *name, 
        }

    }



    bdrv_dirty_bitmap_make_anon(bitmap);

    bdrv_release_dirty_bitmap(bs, bitmap);

}

include/block/dirty-bitmap.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ BdrvDirtyBitmap *bdrv_reclaim_dirty_bitmap(BlockDriverState *bs, 
void bdrv_dirty_bitmap_enable_successor(BdrvDirtyBitmap *bitmap);

BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs,

                                        const char *name);

void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap);

void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap);

void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs);

void bdrv_release_persistent_dirty_bitmaps(BlockDriverState *bs);