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

qcow2-bitmap: add qcow2_reopen_bitmaps_rw_hint() 



Add version of qcow2_reopen_bitmaps_rw, which do the same work but
also return a hint about was header updated or not. This will be
used in the following fix for bitmaps reloading after migration.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20180320170521.32152-2-vsementsov@virtuozzo.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 7b93d78a

block/qcow2-bitmap.c

+14 −1
Original line number Diff line number Diff line
@@ -1004,7 +1004,8 @@ fail: 
    return false;

}



int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp)

int qcow2_reopen_bitmaps_rw_hint(BlockDriverState *bs, bool *header_updated,

                                 Error **errp)

{

    BDRVQcow2State *s = bs->opaque;

    Qcow2BitmapList *bm_list;
@@ -1012,6 +1013,10 @@ int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp) 
    GSList *ro_dirty_bitmaps = NULL;

    int ret = 0;



    if (header_updated != NULL) {

        *header_updated = false;

    }



    if (s->nb_bitmaps == 0) {

        /* No bitmaps - nothing to do */

        return 0;
@@ -1055,6 +1060,9 @@ int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp) 
            error_setg_errno(errp, -ret, "Can't update bitmap directory");

            goto out;

        }

        if (header_updated != NULL) {

            *header_updated = true;

        }

        g_slist_foreach(ro_dirty_bitmaps, set_readonly_helper, false);

    }
@@ -1065,6 +1073,11 @@ out: 
    return ret;

}



int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp)

{

    return qcow2_reopen_bitmaps_rw_hint(bs, NULL, errp);

}



/* store_bitmap_data()

 * Store bitmap to image, filling bitmap table accordingly.

 */

block/qcow2.h

+2 −0
Original line number Diff line number Diff line
@@ -671,6 +671,8 @@ int qcow2_check_bitmaps_refcounts(BlockDriverState *bs, BdrvCheckResult *res, 
                                  void **refcount_table,

                                  int64_t *refcount_table_size);

bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Error **errp);

int qcow2_reopen_bitmaps_rw_hint(BlockDriverState *bs, bool *header_updated,

                                 Error **errp);

int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp);

void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp);

int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp);