commit 792773b2255d25c6f5fe9dfa0ae200debab92de4
author Jan Kiszka <jan.kiszka@web.de> Mon Nov 30 20:34:55 2009 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Thu Dec 03 11:45:39 2009 -0600
tree f1bfd9c276a21abc992d9c29a702e39f97c71697
parent 23bd90d2f916f5a2e0a6ad00d26f3ff26144066d

block migration: Skip zero-sized disks

No need to migrate emptiness (risking divide by zero later on).

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

block-migration.c

diff --git a/block-migration.c b/block-migration.c
index a066f19..258a88a 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -222,6 +222,7 @@
 {
     BlkMigDevState *bmds;
     BlockDriverState *bs;
+    int64_t sectors;
 
     block_mig_state.submitted = 0;
     block_mig_state.read_done = 0;
@@ -231,14 +232,19 @@
 
     for (bs = bdrv_first; bs != NULL; bs = bs->next) {
         if (bs->type == BDRV_TYPE_HD) {
+            sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
+            if (sectors == 0) {
+                continue;
+            }
+
             bmds = qemu_mallocz(sizeof(BlkMigDevState));
             bmds->bs = bs;
             bmds->bulk_completed = 0;
-            bmds->total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
+            bmds->total_sectors = sectors;
             bmds->completed_sectors = 0;
             bmds->shared_base = block_mig_state.shared_base;
 
-            block_mig_state.total_sector_sum += bmds->total_sectors;
+            block_mig_state.total_sector_sum += sectors;
 
             if (bmds->shared_base) {
                 monitor_printf(mon, "Start migration for %s with shared base "