diff options
| author | Junyan He <junyan.he@intel.com> | 2018-07-18 15:48:03 +0800 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2018-08-10 13:29:39 +0300 |
| commit | 56eb90af39abf66c0e80588a9f50c31e7df7320b (patch) | |
| tree | 0baa47b9b9a0b73e25c32fb27aadced6999b21ca | |
| parent | 469dd51bc664979f159d47885997d482991394b8 (diff) | |
| download | qemu-mst-next.tar.gz | |
migration/ram: ensure write persistence on loading all data to PMEM.mst-next
Because we need to make sure the pmem kind memory data is synced
after migration, we choose to call pmem_persist() when the migration
finish. This will make sure the data of pmem is safe and will not
lose if power is off.
Signed-off-by: Junyan He <junyan.he@intel.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | include/qemu/pmem.h | 6 | ||||
| -rw-r--r-- | migration/ram.c | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/qemu/pmem.h b/include/qemu/pmem.h index ebdb0702106..dfb6d0da62c 100644 --- a/include/qemu/pmem.h +++ b/include/qemu/pmem.h @@ -25,6 +25,12 @@ pmem_memcpy_persist(void *pmemdest, const void *src, size_t len) return NULL; } +static inline void +pmem_persist(const void *addr, size_t len) +{ + g_assert_not_reached(); +} + #endif /* CONFIG_LIBPMEM */ #endif /* !QEMU_PMEM_H */ diff --git a/migration/ram.c b/migration/ram.c index 5beefae7f55..fa79d0a5b91 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -33,6 +33,7 @@ #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" @@ -3547,6 +3548,13 @@ static int ram_load_setup(QEMUFile *f, void *opaque) static int ram_load_cleanup(void *opaque) { RAMBlock *rb; + + RAMBLOCK_FOREACH_MIGRATABLE(rb) { + if (ramblock_is_pmem(rb)) { + pmem_persist(rb->host, rb->used_length); + } + } + xbzrle_load_cleanup(); compress_threads_load_cleanup(); |