From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 3 Oct 2018 11:00:07 +0000 (+0200)
Subject: cpu_map: Use and install Icelake model definitions
X-Git-Tag: v4.9.0-rc1~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cae1f47c4bf400438e3616b1dbab4941e6c533f;p=thirdparty%2Flibvirt.git

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 76bcfbc703..9eeb33e4be 100644
--- 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 db82980dd4..dccda3919d 100644
--- 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"/>