]> git.proxmox.com Git - mirror_qemu.git/commitdiff
migration: update recv bitmap only on dest vm
authorPeter Xu <peterx@redhat.com>
Mon, 23 Jul 2018 12:33:02 +0000 (20:33 +0800)
committerDr. David Alan Gilbert <dgilbert@redhat.com>
Tue, 24 Jul 2018 16:10:41 +0000 (17:10 +0100)
We shouldn't update the received bitmap if we're the source VM.  This
fixes a breakage when release-ram is enabled on postcopy.

Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180723123305.24792-2-peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
migration/ram.c

index fdd108475c60c30e5e786975949a2282ac98527c..24dea2730c5b97c19a2030ee9f1b69be895e59b8 100644 (file)
@@ -2827,8 +2827,15 @@ int ram_discard_range(const char *rbname, uint64_t start, size_t length)
         goto err;
     }
 
-    bitmap_clear(rb->receivedmap, start >> qemu_target_page_bits(),
-                 length >> qemu_target_page_bits());
+    /*
+     * On source VM, we don't need to update the received bitmap since
+     * we don't even have one.
+     */
+    if (rb->receivedmap) {
+        bitmap_clear(rb->receivedmap, start >> qemu_target_page_bits(),
+                     length >> qemu_target_page_bits());
+    }
+
     ret = ram_block_discard_range(rb, start, length);
 
 err: