Patchwork [12/23] block migration: Clean up use of total_sectors

login
register
mail settings
Submitter Jan Kiszka
Date Nov. 30, 2009, 5:21 p.m.
Message ID <20091130172120.22889.64304.stgit@mchn012c.ww002.siemens.net>
Download mbox | patch
Permalink /patch/39841/
State New
Headers show

Comments

Jan Kiszka - Nov. 30, 2009, 5:21 p.m.
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>
---

 block-migration.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/block-migration.c b/block-migration.c
index ec32ee2..2f89a4e 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;