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

block/backup: simplify backup_incremental_init_copy_bitmap 



Simplify backup_incremental_init_copy_bitmap using the function
bdrv_dirty_bitmap_next_dirty_area.

Note: move to job->len instead of bitmap size: it should not matter but
less code.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20190429090842.57910-2-vsementsov@virtuozzo.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 8ac0f15f

block/backup.c

+12 −28
Original line number Diff line number Diff line
@@ -394,43 +394,27 @@ static int coroutine_fn backup_run_incremental(BackupBlockJob *job) 
/* init copy_bitmap from sync_bitmap */

static void backup_incremental_init_copy_bitmap(BackupBlockJob *job)

{

    BdrvDirtyBitmapIter *dbi;

    int64_t offset;

    int64_t end = DIV_ROUND_UP(bdrv_dirty_bitmap_size(job->sync_bitmap),

                               job->cluster_size);



    dbi = bdrv_dirty_iter_new(job->sync_bitmap);

    while ((offset = bdrv_dirty_iter_next(dbi)) != -1) {

        int64_t cluster = offset / job->cluster_size;

        int64_t next_cluster;



        offset += bdrv_dirty_bitmap_granularity(job->sync_bitmap);

        if (offset >= bdrv_dirty_bitmap_size(job->sync_bitmap)) {

            hbitmap_set(job->copy_bitmap, cluster, end - cluster);

            break;

        }

    uint64_t offset = 0;

    uint64_t bytes = job->len;



        offset = bdrv_dirty_bitmap_next_zero(job->sync_bitmap, offset,

                                             UINT64_MAX);

        if (offset == -1) {

            hbitmap_set(job->copy_bitmap, cluster, end - cluster);

            break;

        }

    while (bdrv_dirty_bitmap_next_dirty_area(job->sync_bitmap,

                                             &offset, &bytes))

    {

        uint64_t cluster = offset / job->cluster_size;

        uint64_t end_cluster = DIV_ROUND_UP(offset + bytes, job->cluster_size);



        hbitmap_set(job->copy_bitmap, cluster, end_cluster - cluster);



        next_cluster = DIV_ROUND_UP(offset, job->cluster_size);

        hbitmap_set(job->copy_bitmap, cluster, next_cluster - cluster);

        if (next_cluster >= end) {

        offset = end_cluster * job->cluster_size;

        if (offset >= job->len) {

            break;

        }



        bdrv_set_dirty_iter(dbi, next_cluster * job->cluster_size);

        bytes = job->len - offset;

    }



    /* TODO job_progress_set_remaining() would make more sense */

    job_progress_update(&job->common.job,

        job->len - hbitmap_count(job->copy_bitmap) * job->cluster_size);



    bdrv_dirty_iter_free(dbi);

}



static int coroutine_fn backup_run(Job *job, Error **errp)