Compare commits
No commits in common. "59c1dcb053f825ce9af7524616e87eb9d5e6fcec" and "a7691d98eacdcb4ffbb8c3527d67de47db5353a4" have entirely different histories.
59c1dcb053
...
a7691d98ea
@ -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
|
|
||||||
|
|
||||||
@ -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
|
|
||||||
|
|
||||||
@ -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
|
|
||||||
|
|
||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user