From 46830e489779b52bb26dbc98dac6f13981fe811c Mon Sep 17 00:00:00 2001 From: Euler Robot Date: Thu, 4 Feb 2021 17:35:46 +0800 Subject: [PATCH 1/3] add phytium 2000plus and s2500 support on arm architecture for capability Signed-off-by: imxcc --- ...plus-and-s2500-support-on-arm-archit.patch | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 add-phytium-2000plus-and-s2500-support-on-arm-archit.patch diff --git a/add-phytium-2000plus-and-s2500-support-on-arm-archit.patch b/add-phytium-2000plus-and-s2500-support-on-arm-archit.patch new file mode 100644 index 0000000..70dbcdf --- /dev/null +++ b/add-phytium-2000plus-and-s2500-support-on-arm-archit.patch @@ -0,0 +1,81 @@ +From a26baed5dd515430c710dc1cfa6561b7beb48639 Mon Sep 17 00:00:00 2001 +From: root +Date: Thu, 4 Feb 2021 17:35:46 +0800 +Subject: [PATCH] add phytium 2000plus and s2500 support on arm architecture + for capability + +Signed-off-by: imxcc +--- + src/cpu_map/Makefile.inc.am | 2 ++ + src/cpu_map/arm_FT-2000plus.xml | 6 ++++++ + src/cpu_map/arm_Tengyun-S2500.xml | 6 ++++++ + src/cpu_map/arm_vendors.xml | 1 + + src/cpu_map/index.xml | 4 ++++ + 5 files changed, 19 insertions(+) + create mode 100644 src/cpu_map/arm_FT-2000plus.xml + create mode 100644 src/cpu_map/arm_Tengyun-S2500.xml + +diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am +index 3059e2b5b7..8eb818706a 100644 +--- a/src/cpu_map/Makefile.inc.am ++++ b/src/cpu_map/Makefile.inc.am +@@ -73,6 +73,8 @@ cpumap_DATA = \ + cpu_map/arm_cortex-a57.xml \ + cpu_map/arm_cortex-a72.xml \ + cpu_map/arm_Kunpeng-920.xml \ ++ cpu_map/arm_FT-2000plus.xml \ ++ cpu_map/arm_Tengyun-S2500.xml \ + $(NULL) + + EXTRA_DIST += $(cpumap_DATA) +diff --git a/src/cpu_map/arm_FT-2000plus.xml b/src/cpu_map/arm_FT-2000plus.xml +new file mode 100644 +index 0000000000..b532f65f68 +--- /dev/null ++++ b/src/cpu_map/arm_FT-2000plus.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/src/cpu_map/arm_Tengyun-S2500.xml b/src/cpu_map/arm_Tengyun-S2500.xml +new file mode 100644 +index 0000000000..22b865e368 +--- /dev/null ++++ b/src/cpu_map/arm_Tengyun-S2500.xml +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml +index 840bf9a2f8..05175495a0 100644 +--- a/src/cpu_map/arm_vendors.xml ++++ b/src/cpu_map/arm_vendors.xml +@@ -11,4 +11,5 @@ + + + ++ + +diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml +index c7bbd501fd..3ccc76b9ed 100644 +--- a/src/cpu_map/index.xml ++++ b/src/cpu_map/index.xml +@@ -96,5 +96,9 @@ + + + ++ ++ ++ ++ + + +-- +2.27.0 + -- Gitee From 0ae3b46e2e3885381749378585b890b6edb621b1 Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Wed, 8 Dec 2021 16:28:02 +0800 Subject: [PATCH 2/3] spec: Update patch and changelog with !46 add phytium 2000plus and s2500 support on arm architecture for capability !46 add phytium 2000plus and s2500 support on arm architecture for capability Signed-off-by: imxcc --- libvirt.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libvirt.spec b/libvirt.spec index 8be86ff..77e2e52 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -146,6 +146,7 @@ Patch0035: cpu_map-Distribute-x86_Cooperlake.xml.patch Patch0036: conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch Patch0037: storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch Patch0038: security-fix-SELinux-label-generation-logic.patch +Patch0039: add-phytium-2000plus-and-s2500-support-on-arm-archit.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -1878,6 +1879,9 @@ exit 0 %changelog +* Wed Dec 08 2021 Euler Robot +- add phytium 2000plus and s2500 support on arm architecture for capability + * Sun Sep 26 2021 Euler Robot - storage_driver: Unlock object on ACL fail in storagePoolLookupByTargetPath - security: fix SELinux label generation logic -- Gitee From 312f03ca95006b65c3a4e22ee4ddba9b27b0fb23 Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Wed, 8 Dec 2021 16:28:04 +0800 Subject: [PATCH 3/3] spec: Update release version with !46 increase release verison by one Signed-off-by: Chen Qun --- libvirt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index 77e2e52..fc972c4 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -99,7 +99,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.2.0 -Release: 14 +Release: 15 License: LGPLv2+ URL: https://libvirt.org/ -- Gitee