From b74becba6ac33512ad66462111e871db78e078b3 Mon Sep 17 00:00:00 2001
From: Xu Yandong <xuyandong2@huawei.com>
Date: Tue, 26 May 2020 20:31:02 +0800
Subject: [PATCH] cpu_map: introduce Kunpeng-920 cpu features

Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
---
 ...npeng-920-features-as-known-features.patch | 41 +++++++++++++++++++
 libvirt.spec                                  |  5 ++-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 libvirt-cpu_map-add-kunpeng-920-features-as-known-features.patch

diff --git a/libvirt-cpu_map-add-kunpeng-920-features-as-known-features.patch b/libvirt-cpu_map-add-kunpeng-920-features-as-known-features.patch
new file mode 100644
index 0000000..aefd050
--- /dev/null
+++ b/libvirt-cpu_map-add-kunpeng-920-features-as-known-features.patch
@@ -0,0 +1,41 @@
+From f67e57fa41c76e21effd9e61773319ef424a5265 Mon Sep 17 00:00:00 2001
+From: Xu Yandong <xuyandong2@huawei.com>
+Date: Tue, 26 May 2020 20:08:07 +0800
+Subject: [PATCH] cpu_map: add kunpeng-920 features to arm features
+
+Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
+---
+ src/cpu_map/arm_features.xml | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/src/cpu_map/arm_features.xml b/src/cpu_map/arm_features.xml
+index 8a53384..5bed298 100644
+--- a/src/cpu_map/arm_features.xml
++++ b/src/cpu_map/arm_features.xml
+@@ -19,4 +19,23 @@
+   <feature name='sve1920'/>
+   <feature name='sve2048'/>
+ 
++  <!-- Kunpeng-920 cpu features -->
++  <feature name='fp'/>
++  <feature name='asimd'/>
++  <feature name='evtstrm'/>
++  <feature name='aes'/>
++  <feature name='pmull'/>
++  <feature name='sha1'/>
++  <feature name='sha2'/>
++  <feature name='crc32'/>
++  <feature name='atomics'/>
++  <feature name='fphp'/>
++  <feature name='asimdhp'/>
++  <feature name='cpuid'/>
++  <feature name='asimdrdm'/>
++  <feature name='jscvt'/>
++  <feature name='fcma'/>
++  <feature name='dcpop'/>
++  <feature name='asimddp'/>
++  <feature name='asimdfhm'/>
+ </cpus>
+-- 
+2.23.0
+
diff --git a/libvirt.spec b/libvirt.spec
index d85536b..ce888a3 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: 5
+Release: 6
 License: LGPLv2+
 URL: https://libvirt.org/
 
@@ -127,6 +127,7 @@ Patch0016: libvirt-util-virdaemon-fix-waiting-for-child-processes.patch
 Patch0017: libvirt-virsh-Fix-return-code-for-dump-and-migrate.patch
 Patch0018: libvirt-virsh-Fix-return-code-for-dump.patch
 Patch0019: libvirt-cpu-aarch64-enable-host-model-cpu-for-AArch64-archit.patch
+Patch0020: libvirt-cpu_map-add-kunpeng-920-features-as-known-features.patch
 
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -1859,6 +1860,8 @@ exit 0
 
 
 %changelog
+* Tue May 26 2020 Xu Yandong <xuyandong2@huawei.com> - 6.2.0-6
+- Introduce Kunpeng-920 cpu features.
 * Wed May 20 2020 Xu Yandong <xuyandong2@huawei.com> - 6.2.0-5
 - Enable 'host-model' cpu mode.
 * Mon May 11 2020 Xu Yandong <xuyandong2@huawei.com> - 6.2.0-4
-- 
Gitee