|
|
1bdc94 |
From 4251549eca8b113b508f6bf6a7aaca2541acda61 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: "plai@redhat.com" <plai@redhat.com>
|
|
|
1bdc94 |
Date: Fri, 31 Aug 2018 16:25:58 +0200
|
|
|
1bdc94 |
Subject: [PATCH 16/29] migration/ram: Add check and info message to nvdimm
|
|
|
1bdc94 |
post copy.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: plai@redhat.com
|
|
|
1bdc94 |
Message-id: <1535732759-22481-9-git-send-email-plai@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 82009
|
|
|
1bdc94 |
O-Subject: [RHEL7.6 PATCH BZ 1539280 8/9] migration/ram: Add check and info message to nvdimm post copy.
|
|
|
1bdc94 |
Bugzilla: 1539280
|
|
|
1bdc94 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Pankaj Gupta <pagupta@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
From: Junyan He <junyan.he@intel.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
The nvdimm kind memory does not support post copy now.
|
|
|
1bdc94 |
We disable post copy if we have nvdimm memory and print some
|
|
|
1bdc94 |
log hint to user.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Junyan He <junyan.he@intel.com>
|
|
|
1bdc94 |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit 469dd51bc664979f159d47885997d482991394b8)
|
|
|
1bdc94 |
Signed-off-by: Paul Lai <plai@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
migration/ram.c | 9 +++++++++
|
|
|
1bdc94 |
1 file changed, 9 insertions(+)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/migration/ram.c b/migration/ram.c
|
|
|
1bdc94 |
index 04b5df5..f850fd0 100644
|
|
|
1bdc94 |
--- a/migration/ram.c
|
|
|
1bdc94 |
+++ b/migration/ram.c
|
|
|
1bdc94 |
@@ -3120,6 +3120,15 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
static bool ram_has_postcopy(void *opaque)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
+ RAMBlock *rb;
|
|
|
1bdc94 |
+ RAMBLOCK_FOREACH_MIGRATABLE(rb) {
|
|
|
1bdc94 |
+ if (ramblock_is_pmem(rb)) {
|
|
|
1bdc94 |
+ info_report("Block: %s, host: %p is a nvdimm memory, postcopy"
|
|
|
1bdc94 |
+ "is not supported now!", rb->idstr, rb->host);
|
|
|
1bdc94 |
+ return false;
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
return migrate_postcopy_ram();
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|