Commit b598e531 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by John Snow
Browse files

qapi: add x-block-dirty-bitmap-merge 



Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Message-id: 20180606182449.1607-5-jsnow@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent c6490447

block/dirty-bitmap.c

+18 −0
Original line number Diff line number Diff line
@@ -728,3 +728,21 @@ int64_t bdrv_dirty_bitmap_next_zero(BdrvDirtyBitmap *bitmap, uint64_t offset) 
{

    return hbitmap_next_zero(bitmap->bitmap, offset);

}



void bdrv_merge_dirty_bitmap(BdrvDirtyBitmap *dest, const BdrvDirtyBitmap *src,

                             Error **errp)

{

    /* only bitmaps from one bds are supported */

    assert(dest->mutex == src->mutex);



    qemu_mutex_lock(dest->mutex);



    assert(bdrv_dirty_bitmap_enabled(dest));

    assert(!bdrv_dirty_bitmap_readonly(dest));



    if (!hbitmap_merge(dest->bitmap, src->bitmap)) {

        error_setg(errp, "Bitmaps are incompatible and can't be merged");

    }



    qemu_mutex_unlock(dest->mutex);

}

blockdev.c

+30 −0
Original line number Diff line number Diff line
@@ -3043,6 +3043,36 @@ void qmp_x_block_dirty_bitmap_disable(const char *node, const char *name, 
    bdrv_disable_dirty_bitmap(bitmap);

}



void qmp_x_block_dirty_bitmap_merge(const char *node, const char *dst_name,

                                    const char *src_name, Error **errp)

{

    BlockDriverState *bs;

    BdrvDirtyBitmap *dst, *src;



    dst = block_dirty_bitmap_lookup(node, dst_name, &bs, errp);

    if (!dst) {

        return;

    }



    if (bdrv_dirty_bitmap_frozen(dst)) {

        error_setg(errp, "Bitmap '%s' is frozen and cannot be modified",

                   dst_name);

        return;

    } else if (bdrv_dirty_bitmap_readonly(dst)) {

        error_setg(errp, "Bitmap '%s' is readonly and cannot be modified",

                   dst_name);

        return;

    }



    src = bdrv_find_dirty_bitmap(bs, src_name);

    if (!src) {

        error_setg(errp, "Dirty bitmap '%s' not found", src_name);

        return;

    }



    bdrv_merge_dirty_bitmap(dst, src, errp);

}



BlockDirtyBitmapSha256 *qmp_x_debug_block_dirty_bitmap_sha256(const char *node,

                                                              const char *name,

                                                              Error **errp)

include/block/dirty-bitmap.h

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ void bdrv_dirty_bitmap_set_readonly(BdrvDirtyBitmap *bitmap, bool value); 
void bdrv_dirty_bitmap_set_persistance(BdrvDirtyBitmap *bitmap,

                                       bool persistent);

void bdrv_dirty_bitmap_set_qmp_locked(BdrvDirtyBitmap *bitmap, bool qmp_locked);



void bdrv_merge_dirty_bitmap(BdrvDirtyBitmap *dest, const BdrvDirtyBitmap *src,

                             Error **errp);



/* Functions that require manual locking.  */

void bdrv_dirty_bitmap_lock(BdrvDirtyBitmap *bitmap);

qapi/block-core.json

+38 −0
Original line number Diff line number Diff line
@@ -1740,6 +1740,20 @@ 
  'data': { 'node': 'str', 'name': 'str', '*granularity': 'uint32',

            '*persistent': 'bool', '*autoload': 'bool' } }



##

# @BlockDirtyBitmapMerge:

#

# @node: name of device/node which the bitmap is tracking

#

# @dst_name: name of the destination dirty bitmap

#

# @src_name: name of the source dirty bitmap

#

# Since: 3.0

##

{ 'struct': 'BlockDirtyBitmapMerge',

  'data': { 'node': 'str', 'dst_name': 'str', 'src_name': 'str' } }



##

# @block-dirty-bitmap-add:

#
@@ -1850,6 +1864,30 @@ 
    { 'command': 'x-block-dirty-bitmap-disable',

      'data': 'BlockDirtyBitmap' }



##

# @x-block-dirty-bitmap-merge:

#

# Merge @src_name dirty bitmap to @dst_name dirty bitmap. @src_name dirty

# bitmap is unchanged. On error, @dst_name is unchanged.

#

# Returns: nothing on success

#          If @node is not a valid block device, DeviceNotFound

#          If @dst_name or @src_name is not found, GenericError

#          If bitmaps has different sizes or granularities, GenericError

#

# Since: 3.0

#

# Example:

#

# -> { "execute": "x-block-dirty-bitmap-merge",

#      "arguments": { "node": "drive0", "dst_name": "bitmap0",

#                     "src_name": "bitmap1" } }

# <- { "return": {} }

#

##

      { 'command': 'x-block-dirty-bitmap-merge',

        'data': 'BlockDirtyBitmapMerge' }



##

# @BlockDirtyBitmapSha256:

#