Commit acc906c6 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

block: return count of dirty sectors, not chunks 



Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent b812f671

block-migration.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static int64_t get_remaining_dirty(void) 
        dirty += bdrv_get_dirty_count(bmds->bs);

    }



    return dirty * BLOCK_SIZE;

    return dirty << BDRV_SECTOR_BITS;

}



static void blk_mig_cleanup(void)

block.c

+2 −3
Original line number Diff line number Diff line
@@ -2832,8 +2832,7 @@ BlockInfo *bdrv_query_info(BlockDriverState *bs) 
    if (bs->dirty_bitmap) {

        info->has_dirty = true;

        info->dirty = g_malloc0(sizeof(*info->dirty));

        info->dirty->count = bdrv_get_dirty_count(bs) *

            BDRV_SECTORS_PER_DIRTY_CHUNK * BDRV_SECTOR_SIZE;

        info->dirty->count = bdrv_get_dirty_count(bs) * BDRV_SECTOR_SIZE;

    }



    if (bs->drv) {
@@ -4347,7 +4346,7 @@ void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, 
int64_t bdrv_get_dirty_count(BlockDriverState *bs)

{

    if (bs->dirty_bitmap) {

        return hbitmap_count(bs->dirty_bitmap) >> BDRV_LOG_SECTORS_PER_DIRTY_CHUNK;

        return hbitmap_count(bs->dirty_bitmap);

    } else {

        return 0;

    }

block/mirror.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static void coroutine_fn mirror_run(void *opaque) 
        trace_mirror_before_sleep(s, cnt, s->synced);

        if (!s->synced) {

            /* Publish progress */

            s->common.offset = end * BDRV_SECTOR_SIZE - cnt * BLOCK_SIZE;

            s->common.offset = (end - cnt) * BDRV_SECTOR_SIZE;



            if (s->common.speed) {

                delay_ns = ratelimit_calculate_delay(&s->limit, BDRV_SECTORS_PER_DIRTY_CHUNK);