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

block/dirty-bitmap: add autoload field to BdrvDirtyBitmap 



Mirror AUTO flag from Qcow2 bitmap in BdrvDirtyBitmap. This will be
needed in future, to save this flag back to Qcow2 for persistent
bitmaps.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20170628120530.31251-16-vsementsov@virtuozzo.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 1b6b0562

block/dirty-bitmap.c

+18 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ struct BdrvDirtyBitmap { 
                                   Such operations must fail and both the image

                                   and this bitmap must remain unchanged while

                                   this flag is set. */

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

                                   autoloaded on image opening */

    QLIST_ENTRY(BdrvDirtyBitmap) list;

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

    g_free(bitmap->name);

    bitmap->name = NULL;

    bitmap->autoload = false;

}



/* Called with BQL taken.  */
@@ -296,6 +299,8 @@ BdrvDirtyBitmap *bdrv_dirty_bitmap_abdicate(BlockDriverState *bs, 
    bitmap->name = NULL;

    successor->name = name;

    bitmap->successor = NULL;

    successor->autoload = bitmap->autoload;

    bitmap->autoload = false;

    bdrv_release_dirty_bitmap(bs, bitmap);



    return successor;
@@ -671,3 +676,16 @@ bool bdrv_has_readonly_bitmaps(BlockDriverState *bs) 


    return false;

}



/* Called with BQL taken. */

void bdrv_dirty_bitmap_set_autoload(BdrvDirtyBitmap *bitmap, bool autoload)

{

    qemu_mutex_lock(bitmap->mutex);

    bitmap->autoload = autoload;

    qemu_mutex_unlock(bitmap->mutex);

}



bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap)

{

    return bitmap->autoload;

}

block/qcow2-bitmap.c

+2 −0
Original line number Diff line number Diff line
@@ -793,6 +793,8 @@ bool qcow2_load_autoloading_dirty_bitmaps(BlockDriverState *bs, Error **errp) 
            if (bitmap == NULL) {

                goto fail;

            }



            bdrv_dirty_bitmap_set_autoload(bitmap, true);

            bm->flags |= BME_FLAG_IN_USE;

            created_dirty_bitmaps =

                    g_slist_append(created_dirty_bitmaps, bitmap);

include/block/dirty-bitmap.h

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ void bdrv_dirty_bitmap_deserialize_ones(BdrvDirtyBitmap *bitmap, 
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);



/* Functions that require manual locking.  */

void bdrv_dirty_bitmap_lock(BdrvDirtyBitmap *bitmap);
@@ -89,5 +90,6 @@ int64_t bdrv_get_meta_dirty_count(BdrvDirtyBitmap *bitmap); 
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);



#endif