From 20dca81075e712ebcbc151eed9b1a02d4e5d08f5 Mon Sep 17 00:00:00 2001 From: John Snow Date: Fri, 17 Apr 2015 19:50:02 -0400 Subject: block: Ensure consistent bitmap function prototypes We often don't need the BlockDriverState for functions that operate on bitmaps. Remove it. Signed-off-by: John Snow Reviewed-by: Max Reitz Reviewed-by: Stefan Hajnoczi Message-id: 1429314609-29776-15-git-send-email-jsnow@redhat.com Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- migration/block.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'migration') diff --git a/migration/block.c b/migration/block.c index 02a7d26c8b..ddb59ccf87 100644 --- a/migration/block.c +++ b/migration/block.c @@ -304,7 +304,7 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds) blk->aiocb = bdrv_aio_readv(bs, cur_sector, &blk->qiov, nr_sectors, blk_mig_read_cb, blk); - bdrv_reset_dirty_bitmap(bs, bmds->dirty_bitmap, cur_sector, nr_sectors); + bdrv_reset_dirty_bitmap(bmds->dirty_bitmap, cur_sector, nr_sectors); qemu_mutex_unlock_iothread(); bmds->cur_sector = cur_sector + nr_sectors; @@ -497,8 +497,7 @@ static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds, g_free(blk); } - bdrv_reset_dirty_bitmap(bmds->bs, bmds->dirty_bitmap, sector, - nr_sectors); + bdrv_reset_dirty_bitmap(bmds->dirty_bitmap, sector, nr_sectors); break; } sector += BDRV_SECTORS_PER_DIRTY_CHUNK; @@ -584,7 +583,7 @@ static int64_t get_remaining_dirty(void) int64_t dirty = 0; QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) { - dirty += bdrv_get_dirty_count(bmds->bs, bmds->dirty_bitmap); + dirty += bdrv_get_dirty_count(bmds->dirty_bitmap); } return dirty << BDRV_SECTOR_BITS; -- cgit v1.2.3-55-g7522