commit c0bad49946287ef218e871608b753b9991f6e54c
author Paolo Bonzini <pbonzini@redhat.com> Mon Jun 05 14:39:04 2017 +0200
committer Fam Zheng <famz@redhat.com> Fri Jun 16 07:55:00 2017 +0800
tree 4fd4c9821a88147f939e5d1acc29a30b952ec568
parent 2119882c7eb7e2c612b24fc0c8d86f5887d6f1c3

migration/block: reset dirty bitmap before reading

Any data that is returned by read may be stale already, the bitmap
has to be cleared before issuing the read.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20170605123908.18777-16-pbonzini@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>

migration/block.c

diff --git a/migration/block.c b/migration/block.c
index 9e20926..423877b 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -532,6 +532,8 @@
             } else {
                 nr_sectors = BDRV_SECTORS_PER_DIRTY_CHUNK;
             }
+            bdrv_reset_dirty_bitmap(bmds->dirty_bitmap, sector, nr_sectors);
+
             blk = g_new(BlkMigBlock, 1);
             blk->buf = g_malloc(BLOCK_SIZE);
             blk->bmds = bmds;
@@ -564,7 +566,6 @@
                 g_free(blk);
             }
 
-            bdrv_reset_dirty_bitmap(bmds->dirty_bitmap, sector, nr_sectors);
             sector += nr_sectors;
             bmds->cur_dirty = sector;