Commit 5fba6c0e authored by John Snow's avatar John Snow Committed by Kevin Wolf
Browse files

qmp: Ensure consistent granularity type 



We treat this field with a variety of different types everywhere
in the code. Now it's just uint32_t.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1429314609-29776-4-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 0db6e54a

block.c

+6 −5
Original line number Diff line number Diff line
@@ -5522,12 +5522,13 @@ void bdrv_dirty_bitmap_make_anon(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) 
}



BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,

                                          int granularity,

                                          uint32_t granularity,

                                          const char *name,

                                          Error **errp)

{

    int64_t bitmap_size;

    BdrvDirtyBitmap *bitmap;

    uint32_t sector_granularity;



    assert((granularity & (granularity - 1)) == 0);
@@ -5535,8 +5536,8 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, 
        error_setg(errp, "Bitmap already exists: %s", name);

        return NULL;

    }

    granularity >>= BDRV_SECTOR_BITS;

    assert(granularity);

    sector_granularity = granularity >> BDRV_SECTOR_BITS;

    assert(sector_granularity);

    bitmap_size = bdrv_nb_sectors(bs);

    if (bitmap_size < 0) {

        error_setg_errno(errp, -bitmap_size, "could not get length of device");
@@ -5544,7 +5545,7 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, 
        return NULL;

    }

    bitmap = g_new0(BdrvDirtyBitmap, 1);

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

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

    bitmap->name = g_strdup(name);

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

    return bitmap;
@@ -5575,7 +5576,7 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs) 
        BlockDirtyInfoList *entry = g_new0(BlockDirtyInfoList, 1);

        info->count = bdrv_get_dirty_count(bs, bm);

        info->granularity =

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

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

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

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

        entry->value = info;

block/mirror.c

+2 −2
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ static const BlockJobDriver commit_active_job_driver = { 


static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,

                             const char *replaces,

                             int64_t speed, int64_t granularity,

                             int64_t speed, uint32_t granularity,

                             int64_t buf_size,

                             BlockdevOnError on_source_error,

                             BlockdevOnError on_target_error,
@@ -717,7 +717,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, 


void mirror_start(BlockDriverState *bs, BlockDriverState *target,

                  const char *replaces,

                  int64_t speed, int64_t granularity, int64_t buf_size,

                  int64_t speed, uint32_t granularity, int64_t buf_size,

                  MirrorSyncMode mode, BlockdevOnError on_source_error,

                  BlockdevOnError on_target_error,

                  BlockCompletionFunc *cb,

include/block/block.h

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov); 
struct HBitmapIter;

typedef struct BdrvDirtyBitmap BdrvDirtyBitmap;

BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,

                                          int granularity,

                                          uint32_t granularity,

                                          const char *name,

                                          Error **errp);

BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs,

include/block/block_int.h

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ void commit_active_start(BlockDriverState *bs, BlockDriverState *base, 
 */

void mirror_start(BlockDriverState *bs, BlockDriverState *target,

                  const char *replaces,

                  int64_t speed, int64_t granularity, int64_t buf_size,

                  int64_t speed, uint32_t granularity, int64_t buf_size,

                  MirrorSyncMode mode, BlockdevOnError on_source_error,

                  BlockdevOnError on_target_error,

                  BlockCompletionFunc *cb,

qapi/block-core.json

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ 
# Since: 1.3

##

{ 'type': 'BlockDirtyInfo',

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

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



##

# @BlockInfo: