From: Juan Quintela <quintela@redhat.com>
Date: Mon, 3 Oct 2022 03:15:56 +0000 (+0200)
Subject: migration: Block migration comment or code is wrong
X-Git-Tag: v7.2.0-rc2~9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5280437a7f49cf617cdd99bbbe2c7bd1652408b;p=thirdparty%2Fqemu.git

migration: Block migration comment or code is wrong

And it appears that what is wrong is the code. During bulk stage we
need to make sure that some block is dirty, but no games with
max_size at all.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/migration/block.c b/migration/block.c
index 3577c815a94..4347da1526a 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -880,8 +880,8 @@ static void block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size,
     blk_mig_unlock();
 
     /* Report at least one block pending during bulk phase */
-    if (pending <= max_size && !block_mig_state.bulk_completed) {
-        pending = max_size + BLK_MIG_BLOCK_SIZE;
+    if (!pending && !block_mig_state.bulk_completed) {
+        pending = BLK_MIG_BLOCK_SIZE;
     }
 
     trace_migration_block_save_pending(pending);