migration: ram: Switch to ram block writeback

Switch to ram block writeback for pmem migration.

Signed-off-by: Beata Michalska <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
Reviewed-by: Alex Bennée <[email protected]>
Acked-by: Dr. David Alan Gilbert <[email protected]>
Message-id: 20191121000843[email protected]
Signed-off-by: Peter Maydell <[email protected]>

diff --git a/migration/ram.c b/migration/ram.c
index 5078f94490de7a1bc71670376078f44e69affb84..38070f1bb2385a0eef182fa6ae6db8e9d17eb3c7 100644 (file)
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -33,7 +33,6 @@
 #include "qemu/bitops.h"
 #include "qemu/bitmap.h"
 #include "qemu/main-loop.h"
-#include "qemu/pmem.h"
 #include "xbzrle.h"
 #include "ram.h"
 #include "migration.h"
@@ -3981,9 +3980,7 @@ static int ram_load_cleanup(void *opaque)
     RAMBlock *rb;
 
     RAMBLOCK_FOREACH_NOT_IGNORED(rb) {
-        if (ramblock_is_pmem(rb)) {
-            pmem_persist(rb->host, rb->used_length);
-        }
+        qemu_ram_block_writeback(rb);
     }
 
     xbzrle_load_cleanup();