Commit 0db6e54a authored by Fam Zheng's avatar Fam Zheng Committed by Kevin Wolf
Browse files

qapi: Add optional field "name" to block dirty bitmap 



This field will be set for user created dirty bitmap. Also pass in an
error pointer to bdrv_create_dirty_bitmap, so when a name is already
taken on this BDS, it can report an error message. This is not global
check, two BDSes can have dirty bitmap with a common name.

Implemented bdrv_find_dirty_bitmap to find a dirty bitmap by name, will
be used later when other QMP commands want to reference dirty bitmap by
name.

Add bdrv_dirty_bitmap_make_anon. This unsets the name of dirty bitmap.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1429314609-29776-3-git-send-email-jsnow@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent efcfa278

block.c

+31 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 


struct BdrvDirtyBitmap {

    HBitmap *bitmap;

    char *name;

    QLIST_ENTRY(BdrvDirtyBitmap) list;

};
@@ -5501,7 +5502,28 @@ bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov) 
    return true;

}



BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, int granularity,

BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs, const char *name)

{

    BdrvDirtyBitmap *bm;



    assert(name);

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

        if (bm->name && !strcmp(name, bm->name)) {

            return bm;

        }

    }

    return NULL;

}



void bdrv_dirty_bitmap_make_anon(BlockDriverState *bs, BdrvDirtyBitmap *bitmap)

{

    g_free(bitmap->name);

    bitmap->name = NULL;

}



BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,

                                          int granularity,

                                          const char *name,

                                          Error **errp)

{

    int64_t bitmap_size;
@@ -5509,6 +5531,10 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, int granularity, 


    assert((granularity & (granularity - 1)) == 0);



    if (name && bdrv_find_dirty_bitmap(bs, name)) {

        error_setg(errp, "Bitmap already exists: %s", name);

        return NULL;

    }

    granularity >>= BDRV_SECTOR_BITS;

    assert(granularity);

    bitmap_size = bdrv_nb_sectors(bs);
@@ -5519,6 +5545,7 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, int granularity, 
    }

    bitmap = g_new0(BdrvDirtyBitmap, 1);

    bitmap->bitmap = hbitmap_alloc(bitmap_size, ctz32(granularity));

    bitmap->name = g_strdup(name);

    QLIST_INSERT_HEAD(&bs->dirty_bitmaps, bitmap, list);

    return bitmap;

}
@@ -5530,6 +5557,7 @@ void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) 
        if (bm == bitmap) {

            QLIST_REMOVE(bitmap, list);

            hbitmap_free(bitmap->bitmap);

            g_free(bitmap->name);

            g_free(bitmap);

            return;

        }
@@ -5548,6 +5576,8 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs) 
        info->count = bdrv_get_dirty_count(bs, bm);

        info->granularity =

            ((int64_t) BDRV_SECTOR_SIZE << hbitmap_granularity(bm->bitmap));

        info->has_name = !!bm->name;

        info->name = g_strdup(bm->name);

        entry->value = info;

        *plist = entry;

        plist = &entry->next;

block/mirror.c

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, 
    s->granularity = granularity;

    s->buf_size = MAX(buf_size, granularity);



    s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, errp);

    s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);

    if (!s->dirty_bitmap) {

        return;

    }

include/block/block.h

+6 −1
Original line number Diff line number Diff line
@@ -450,8 +450,13 @@ bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov); 


struct HBitmapIter;

typedef struct BdrvDirtyBitmap BdrvDirtyBitmap;

BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, int granularity,

BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,

                                          int granularity,

                                          const char *name,

                                          Error **errp);

BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs,

                                        const char *name);

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

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

BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs);

int bdrv_get_dirty(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, int64_t sector);

migration/block.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static int set_dirty_tracking(void) 


    QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {

        bmds->dirty_bitmap = bdrv_create_dirty_bitmap(bmds->bs, BLOCK_SIZE,

                                                      NULL);

                                                      NULL, NULL);

        if (!bmds->dirty_bitmap) {

            ret = -errno;

            goto fail;

qapi/block-core.json

+3 −1
Original line number Diff line number Diff line
@@ -330,6 +330,8 @@ 
#

# Block dirty bitmap information.

#

# @name: #optional the name of the dirty bitmap (Since 2.4)

#

# @count: number of dirty bytes according to the dirty bitmap

#

# @granularity: granularity of the dirty bitmap in bytes (since 1.4)
@@ -337,7 +339,7 @@ 
# Since: 1.3

##

{ 'type': 'BlockDirtyInfo',

  'data': {'count': 'int', 'granularity': 'int'} }

  'data': {'*name': 'str', 'count': 'int', 'granularity': 'int'} }



##

# @BlockInfo: