0001-add-aarch64-cpu-value.patch

@@ -1,24 +0,0 @@
-From 19da779d059b5595644c7e7145f8475a83c0b29c Mon Sep 17 00:00:00 2001
-From: wangge <wangge20@huawei.com>
-Date: Sat, 9 Oct 2021 10:33:48 +0800
-Subject: [PATCH] add aarch64 cpu value
-
----
- lib/vdsm/cpuinfo.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/vdsm/cpuinfo.py b/lib/vdsm/cpuinfo.py
-index b24d906..2f9d889 100644
---- a/lib/vdsm/cpuinfo.py
-+++ b/lib/vdsm/cpuinfo.py
-@@ -87,6 +87,7 @@ def _cpuinfo():
-             elif key == 'model name':  # x86_64
-                 fields['model'] = value
-             elif key == 'CPU part':  # aarch64
-+                value = "asimd" if value == "0xd01" else value
-                 fields['model'] = value
-             elif re.match(r'processor \d+', key):  # s390
-                 match = re.search(r'\bmachine\s*=\s*(\w+)', value)
--- 
-2.27.0
-

0002-add-get-uuid-method-for-arm.patch

@@ -1,53 +0,0 @@
-From 441cda8a132876dac91bd81b26efd3057305afbb Mon Sep 17 00:00:00 2001
-From: wang--ge <wang__ge@126.com>
-Date: Wed, 13 Oct 2021 14:48:02 +0800
-Subject: [PATCH] add get uuid method for arm
-
----
- lib/vdsm/host/__init__.py | 5 +++++
- lib/vdsm/osinfo.py        | 6 ++++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/lib/vdsm/host/__init__.py b/lib/vdsm/host/__init__.py
-index 9d529d7..fbdea70 100644
---- a/lib/vdsm/host/__init__.py
-+++ b/lib/vdsm/host/__init__.py
-@@ -55,6 +55,11 @@ def uuid():
-                         host_UUID = systemId.rstrip('\0').replace(',', '')
-                 except IOError:
-                     logging.warning('Could not find host UUID.')
-+            elif cpuarch.is_arm(arch):
-+                try:
-+                   host_UUID = os.popen('dmidecode -s system-uuid').read().strip()
-+                except KeyError:
-+                    logging.warning('Could not find host UUID.')
- 
-     except:
-         logging.error("Error retrieving host UUID", exc_info=True)
-diff --git a/lib/vdsm/osinfo.py b/lib/vdsm/osinfo.py
-index deae299..8dccae9 100644
---- a/lib/vdsm/osinfo.py
-+++ b/lib/vdsm/osinfo.py
-@@ -118,6 +118,8 @@ def _release_name():
-         return OSName.RHEL
-     elif os.path.exists('/etc/debian_version'):
-         return OSName.DEBIAN
-+    elif os.path.exists('/etc/openEuler-release'):
-+        return OSName.RHEL
-     else:
-         return OSName.UNKNOWN
- 
-@@ -282,8 +284,8 @@ def package_versions():
-                                   KEY_PACKAGES[pkg])
-                 else:
-                     pkgs[pkg] = {
--                        'version': mi['version'].decode('utf-8'),
--                        'release': mi['release'].decode('utf-8'),
-+                        'version': mi['version'],
-+                        'release': mi['release'],
-                     }
-         except Exception:
-             logging.error('', exc_info=True)
--- 
-2.27.0
-

0003-add-aarch64-architecture-support.patch

@@ -1,24 +0,0 @@
-From 65d18050391082503200f222f2312d9ca705ddae Mon Sep 17 00:00:00 2001
-From: wang--ge <wang__ge@126.com>
-Date: Tue, 16 Nov 2021 10:04:22 +0800
-Subject: [PATCH] add aarch64 architecture support
-
----
- lib/vdsm/virt/libvirtxml.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/vdsm/virt/libvirtxml.py b/lib/vdsm/virt/libvirtxml.py
-index 51e59be..f4c1d5d 100644
---- a/lib/vdsm/virt/libvirtxml.py
-+++ b/lib/vdsm/virt/libvirtxml.py
-@@ -33,6 +33,7 @@ _DEFAULT_MACHINES = {
-     cpuarch.PPC64: 'pseries',
-     cpuarch.PPC64LE: 'pseries',
-     cpuarch.S390X: 's390-ccw-virtio',
-+    cpuarch.AARCH64: 'virt',
- }
- 
- 
--- 
-2.27.0
-

vdsm.spec

@@ -50,16 +50,14 @@
 
 Name:           %{vdsm_name}
 Version:        4.40.60.7
-Release:        6
+Release:        2
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
 License:        GPLv2+
 Url:            http://www.ovirt.org/develop/developer-guide/vdsm/vdsm/
 Source0:        %{vdsm_name}-%{version}.tar.gz
-Patch1:         0001-add-aarch64-cpu-value.patch
+
-Patch2:         0002-add-get-uuid-method-for-arm.patch
-Patch3:         0003-add-aarch64-architecture-support.patch
 %{!?_licensedir:%global license %%doc}
 
 BuildRequires: openssl
@@ -576,9 +574,6 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %if 0%{?enable_autotools}
@@ -653,12 +648,6 @@ if [ "$1" -gt 1 ]; then
 fi
 
 %post
-# x86_64 use 1G hugepage, aarch64 use 512M hugepage
-# if aarch64, modify the systemd hugepage mount unit file here
-%ifarch aarch64
-sed -i 's/1048576/524288/g' %{_unitdir}/dev-hugepages1G.mount
-sed -i 's/pagesize=1G/pagesize=512M/g' %{_unitdir}/dev-hugepages1G.mount
-%endif
 # After vdsm install we should create the logs files.
 # In the install session we create it but since we use
 # the ghost macro (in files session) the files are not included
@@ -693,6 +682,7 @@ fi
 %systemd_preun vdsm-network.service
 %systemd_preun supervdsmd.service
 %systemd_preun mom-vdsm.service
+%systemd_preun ksmtuned.service
 exit 0
 
 %posttrans
@@ -1124,18 +1114,6 @@ exit 0
 %endif
 
 %changelog
-* Thu Jun 30 2022 jiangxinyu <jiangxinyu@kylinos.cn> - 4.40.60.7-6
-- Only modify hugepage size for aarch64
-
-* Mon Mar 28 2022 jiangxinyu <jiangxinyu@kylinos.cn> - 4.40.60.7-5
-- Remove ksmtuned.service
-
-* Tue Nov 16 2021 Ge Wang <wangge20@huawei.com> - 4.40.60.7-4
-- Add aarch64 architecture support
-
-* Wed Oct 13 2021 Ge Wang <wangge20@huawei.com> - 4.40.60.7-3
-- Add get uuid method for arm
-
 * Sep 14 2021 huanghaitao <huanghaitao8@huawei.com> - 4.40.60.7-2
 - Remove the restriction on the kernel version