[2/5] migration/block: reset dirty bitmap before read in bulk phase

Commit Message

Peter Lieven March 8, 2018, 11:18 a.m. UTC

Reset the dirty bitmap before reading to make sure we don't miss
any new data.

Cc: [e-mail]
Signed-off-by: Peter Lieven <[e-mail]>
---
 migration/block.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Juan Quintela March 8, 2018, 11:39 a.m. UTC | #1

Peter Lieven <[e-mail]> wrote:
> Reset the dirty bitmap before reading to make sure we don't miss
> any new data.
>
> Cc: [e-mail]
> Signed-off-by: Peter Lieven <[e-mail]>

Reviewed-by: Juan Quintela <[e-mail]>

Patch

diff --git a/migration/block.c b/migration/block.c
index 1f03946..87bb35c 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -331,11 +331,10 @@  static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds)
      */
     qemu_mutex_lock_iothread();
     aio_context_acquire(blk_get_aio_context(bmds->blk));
-    blk->aiocb = blk_aio_preadv(bb, cur_sector * BDRV_SECTOR_SIZE, &blk->qiov,
-                                0, blk_mig_read_cb, blk);
-
     bdrv_reset_dirty_bitmap(bmds->dirty_bitmap, cur_sector * BDRV_SECTOR_SIZE,
                             nr_sectors * BDRV_SECTOR_SIZE);
+    blk->aiocb = blk_aio_preadv(bb, cur_sector * BDRV_SECTOR_SIZE, &blk->qiov,
+                                0, blk_mig_read_cb, blk);
     aio_context_release(blk_get_aio_context(bmds->blk));
     qemu_mutex_unlock_iothread();