block migration: Clean up use of total_sectors

We already save total_sectors in BlkMigDevState, let's use this value
during the migration and avoid to recalculate it needlessly.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jan Kiszka 2009-11-30 18:21:20 +01:00 committed by Anthony Liguori
parent 69d63a97a1
commit b1d10856d6

View File

@ -96,10 +96,10 @@ static int mig_read_device_bulk(QEMUFile *f, BlkMigDevState *bms)
blk->buf = qemu_malloc(BLOCK_SIZE); blk->buf = qemu_malloc(BLOCK_SIZE);
cur_sector = bms->cur_sector; cur_sector = bms->cur_sector;
total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS; total_sectors = bms->total_sectors;
if (bms->shared_base) { if (bms->shared_base) {
while (cur_sector < bms->total_sectors && while (cur_sector < total_sectors &&
!bdrv_is_allocated(bms->bs, cur_sector, !bdrv_is_allocated(bms->bs, cur_sector,
MAX_IS_ALLOCATED_SEARCH, &nr_sectors)) { MAX_IS_ALLOCATED_SEARCH, &nr_sectors)) {
cur_sector += nr_sectors; cur_sector += nr_sectors;
@ -165,7 +165,7 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds)
cur_sector = bmds->cur_sector; cur_sector = bmds->cur_sector;
if (bmds->shared_base) { if (bmds->shared_base) {
while (cur_sector < bmds->total_sectors && while (cur_sector < total_sectors &&
!bdrv_is_allocated(bmds->bs, cur_sector, !bdrv_is_allocated(bmds->bs, cur_sector,
MAX_IS_ALLOCATED_SEARCH, &nr_sectors)) { MAX_IS_ALLOCATED_SEARCH, &nr_sectors)) {
cur_sector += nr_sectors; cur_sector += nr_sectors;