ignore pin_memory init in x86

This commit is contained in:
hejingxian 2022-12-02 18:11:27 +08:00
parent 92e34fcc2b
commit 5d142f5d6e
2 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,39 @@
From fe0b709d2fe196097796b3b964803226c6ca9578 Mon Sep 17 00:00:00 2001
From: hejingxian <hejingxian@huawei.com>
Date: Thu, 1 Dec 2022 23:02:21 +0800
Subject: [PATCH] ignore pin memory init in x86
Signed-off-by: hejingxian <hejingxian@huawei.com>
---
misc/nvwa-pre.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/misc/nvwa-pre.sh b/misc/nvwa-pre.sh
index 69f6de9..18960e7 100644
--- a/misc/nvwa-pre.sh
+++ b/misc/nvwa-pre.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-set -e
+#set -e
# 1. Increase last pid by 2011 from saved last pid.
# So services restoring may use its old pid.
@@ -32,8 +32,11 @@ else
fi
# 2. Enable Pin Memory
-modprobe pin_memory
-/usr/bin/nvwa-pin --init-pagemap-read
+is_x86=`uname -a | grep x86`
+if [[ $is_x86"X" == "X" ]]; then
+ modprobe pin_memory
+ /usr/bin/nvwa-pin --init-pagemap-read
+fi
# 3. Enable PMEM
grep -q "Persistent Memory" /proc/iomem || exit 0
--
2.20.1.windows.1

View File

@ -7,6 +7,8 @@ License: MulanPSL-2.0 and Apache-2.0 and MIT and MPL-2.0
URL: https://gitee.com/openeuler/nvwa
Source: %{name}-v%{version}.tar.gz
Patch1: 0001-ignore-pin-memory-init-in-x86.patch
BuildRequires: golang >= 1.13
Requires: kexec-tools criu
Requires: systemd-units iptables-services iproute
@ -18,7 +20,7 @@ A tool used to automate the process of seamless update of the openEuler.
%global debug_package %{nil}
%prep
%autosetup -n %{name}-v%{version}
%autosetup -n %{name}-v%{version} -p1
%build