Commit a88b179f authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Max Reitz
Browse files

block: introduce persistent dirty bitmaps 



New field BdrvDirtyBitmap.persistent means, that bitmap should be saved
by format driver in .bdrv_close and .bdrv_inactivate. No format driver
supports it for now.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20170628120530.31251-18-vsementsov@virtuozzo.com
[mreitz: Fixed indentation]
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent cca43ae1

block/dirty-bitmap.c

+29 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ struct BdrvDirtyBitmap { 
                                   this flag is set. */

    bool autoload;              /* For persistent bitmaps: bitmap must be

                                   autoloaded on image opening */

    bool persistent;            /* bitmap must be saved to owner disk image */

    QLIST_ENTRY(BdrvDirtyBitmap) list;

};
@@ -102,6 +103,7 @@ void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap) 
    assert(!bdrv_dirty_bitmap_frozen(bitmap));

    g_free(bitmap->name);

    bitmap->name = NULL;

    bitmap->persistent = false;

    bitmap->autoload = false;

}
@@ -299,6 +301,8 @@ BdrvDirtyBitmap *bdrv_dirty_bitmap_abdicate(BlockDriverState *bs, 
    bitmap->name = NULL;

    successor->name = name;

    bitmap->successor = NULL;

    successor->persistent = bitmap->persistent;

    bitmap->persistent = false;

    successor->autoload = bitmap->autoload;

    bitmap->autoload = false;

    bdrv_release_dirty_bitmap(bs, bitmap);
@@ -689,3 +693,28 @@ bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap) 
{

    return bitmap->autoload;

}



/* Called with BQL taken. */

void bdrv_dirty_bitmap_set_persistance(BdrvDirtyBitmap *bitmap, bool persistent)

{

    qemu_mutex_lock(bitmap->mutex);

    bitmap->persistent = persistent;

    qemu_mutex_unlock(bitmap->mutex);

}



bool bdrv_dirty_bitmap_get_persistance(BdrvDirtyBitmap *bitmap)

{

    return bitmap->persistent;

}



bool bdrv_has_changed_persistent_bitmaps(BlockDriverState *bs)

{

    BdrvDirtyBitmap *bm;

    QLIST_FOREACH(bm, &bs->dirty_bitmaps, list) {

        if (bm->persistent && !bm->readonly) {

            return true;

        }

    }



    return false;

}

block/qcow2-bitmap.c

+1 −0
Original line number Diff line number Diff line
@@ -794,6 +794,7 @@ bool qcow2_load_autoloading_dirty_bitmaps(BlockDriverState *bs, Error **errp) 
                goto fail;

            }



            bdrv_dirty_bitmap_set_persistance(bitmap, true);

            bdrv_dirty_bitmap_set_autoload(bitmap, true);

            bm->flags |= BME_FLAG_IN_USE;

            created_dirty_bitmaps =

include/block/dirty-bitmap.h

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap *bitmap); 


void bdrv_dirty_bitmap_set_readonly(BdrvDirtyBitmap *bitmap, bool value);

void bdrv_dirty_bitmap_set_autoload(BdrvDirtyBitmap *bitmap, bool autoload);

void bdrv_dirty_bitmap_set_persistance(BdrvDirtyBitmap *bitmap,

                                       bool persistent);



/* Functions that require manual locking.  */

void bdrv_dirty_bitmap_lock(BdrvDirtyBitmap *bitmap);
@@ -91,5 +93,7 @@ void bdrv_dirty_bitmap_truncate(BlockDriverState *bs); 
bool bdrv_dirty_bitmap_readonly(const BdrvDirtyBitmap *bitmap);

bool bdrv_has_readonly_bitmaps(BlockDriverState *bs);

bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap);

bool bdrv_dirty_bitmap_get_persistance(BdrvDirtyBitmap *bitmap);

bool bdrv_has_changed_persistent_bitmaps(BlockDriverState *bs);



#endif