From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Mon, 30 Nov 2009 17:21:20 +0000 (+0100)
Subject: block migration: Clean up use of total_sectors
X-Git-Tag: v0.12.0-rc0~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1d10856d687b449a0dc4eca3a8db41055e2d3b8;p=thirdparty%2Fqemu.git

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>
---

diff --git a/block-migration.c b/block-migration.c
index ec32ee27cba..2f89a4ee9a3 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -96,10 +96,10 @@ static int mig_read_device_bulk(QEMUFile *f, BlkMigDevState *bms)
     blk->buf = qemu_malloc(BLOCK_SIZE);
 
     cur_sector = bms->cur_sector;
-    total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
+    total_sectors = bms->total_sectors;
 
     if (bms->shared_base) {
-        while (cur_sector < bms->total_sectors &&
+        while (cur_sector < total_sectors &&
                !bdrv_is_allocated(bms->bs, cur_sector,
                                   MAX_IS_ALLOCATED_SEARCH, &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;
 
     if (bmds->shared_base) {
-        while (cur_sector < bmds->total_sectors &&
+        while (cur_sector < total_sectors &&
                !bdrv_is_allocated(bmds->bs, cur_sector,
                                   MAX_IS_ALLOCATED_SEARCH, &nr_sectors)) {
             cur_sector += nr_sectors;