diff options
| author | Eric Blake <eblake@redhat.com> | 2017-09-25 09:55:20 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-10-06 16:28:58 +0200 |
| commit | e0d7f73e63427521aabd7311a86fe90fd02897c0 (patch) | |
| tree | dcf7dde8cb8ebfa6e8ebf3c3a4e7c94aca628459 /migration | |
| parent | 3b5d4df0c6b52746c6194bd2ea65828822db8438 (diff) | |
| download | qemu-e0d7f73e63427521aabd7311a86fe90fd02897c0.zip qemu-e0d7f73e63427521aabd7311a86fe90fd02897c0.tar.gz qemu-e0d7f73e63427521aabd7311a86fe90fd02897c0.tar.bz2 | |
dirty-bitmap: Change bdrv_[re]set_dirty_bitmap() to use bytes
Some of the callers were already scaling bytes to sectors; others
can be easily converted to pass byte offsets, all in our shift
towards a consistent byte interface everywhere. Making the change
will also make it easier to write the hold-out callers to use byte
rather than sectors for their iterations; it also makes it easier
for a future dirty-bitmap patch to offload scaling over to the
internal hbitmap. Although all callers happen to pass
sector-aligned values, make the internal scaling robust to any
sub-sector requests.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/block.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/migration/block.c b/migration/block.c index f5bcf55..3282809 100644 --- a/migration/block.c +++ b/migration/block.c @@ -334,7 +334,8 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds) blk->aiocb = blk_aio_preadv(bb, cur_sector * BDRV_SECTOR_SIZE, &blk->qiov, 0, blk_mig_read_cb, blk); - bdrv_reset_dirty_bitmap(bmds->dirty_bitmap, cur_sector, nr_sectors); + bdrv_reset_dirty_bitmap(bmds->dirty_bitmap, cur_sector * BDRV_SECTOR_SIZE, + nr_sectors * BDRV_SECTOR_SIZE); aio_context_release(blk_get_aio_context(bmds->blk)); qemu_mutex_unlock_iothread(); @@ -542,7 +543,9 @@ static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds, } else { nr_sectors = BDRV_SECTORS_PER_DIRTY_CHUNK; } - bdrv_reset_dirty_bitmap_locked(bmds->dirty_bitmap, sector, nr_sectors); + bdrv_reset_dirty_bitmap_locked(bmds->dirty_bitmap, + sector * BDRV_SECTOR_SIZE, + nr_sectors * BDRV_SECTOR_SIZE); bdrv_dirty_bitmap_unlock(bmds->dirty_bitmap); blk = g_new(BlkMigBlock, 1); |