cpu_map: Use and install Icelake model definitions

In commit v4.7.0-168-g993d85ae5e I introduced two Icelake CPU models,
but failed to actually include them in the CPU map index.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am
index 76bcfbc703031835802e9fa6c83770b8f5e478bd..9eeb33e4be81b58f44ed115447fcef801ab86d3b 100644 (file)
--- a/src/cpu_map/Makefile.inc.am
+++ b/src/cpu_map/Makefile.inc.am
@@ -27,6 +27,8 @@ cpumap_DATA = \
        cpu_map/x86_Haswell-IBRS.xml \
        cpu_map/x86_Haswell-noTSX.xml \
        cpu_map/x86_Haswell-noTSX-IBRS.xml \
+       cpu_map/x86_Icelake-Client.xml \
+       cpu_map/x86_Icelake-Server.xml \
        cpu_map/x86_IvyBridge.xml \
        cpu_map/x86_IvyBridge-IBRS.xml \
        cpu_map/x86_kvm32.xml \

diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index db82980dd429bacf86759c1d46b173b43fda5c41..dccda3919dd549aea4dfc7103146cb28969f8202 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -46,6 +46,8 @@
     <include filename="x86_Skylake-Client-IBRS.xml"/>
     <include filename="x86_Skylake-Server.xml"/>
     <include filename="x86_Skylake-Server-IBRS.xml"/>
+    <include filename="x86_Icelake-Client.xml"/>
+    <include filename="x86_Icelake-Server.xml"/>
 
     <!-- AMD CPUs -->
     <include filename="x86_athlon.xml"/>