From 72bcfcf07c76288e943602995308d3e505aa1cff Mon Sep 17 00:00:00 2001
Message-Id: <72bcfcf07c76288e943602995308d3e505aa1cff@dist-git>
From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 21 Jun 2019 09:25:11 +0200
Subject: [PATCH] cpu_map: Add more signatures for Nehalem CPU models
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit f349f3c53f6427d9955ab7c57900c094f06dfd87)

https://bugzilla.redhat.com/show_bug.cgi?id=1686895

Conflicts:
	src/cpu_map/x86_Nehalem-IBRS.xml
	src/cpu_map/x86_Nehalem.xml
            - cpu_map split not backported

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Message-Id: <6351ae62d5ea091e831968cd1fc50176d1552a86.1561068591.git.jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/cpu/cpu_map.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index f42b2e629c..4f9c247f3e 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -897,6 +897,9 @@
 
     <model name='Nehalem'>
       <signature family='6' model='26'/> <!-- 0106a0 -->
+      <signature family='6' model='30'/> <!-- 0106e0 -->
+      <signature family='6' model='31'/> <!-- 0106f0 -->
+      <signature family='6' model='46'/> <!-- 0206e0 -->
       <vendor name='Intel'/>
       <feature name='apic'/>
       <feature name='clflush'/>
@@ -933,6 +936,9 @@
 
     <model name='Nehalem-IBRS'>
       <signature family='6' model='26'/> <!-- 0106a0 -->
+      <signature family='6' model='30'/> <!-- 0106e0 -->
+      <signature family='6' model='31'/> <!-- 0106f0 -->
+      <signature family='6' model='46'/> <!-- 0206e0 -->
       <vendor name='Intel'/>
       <feature name='apic'/>
       <feature name='clflush'/>
-- 
2.22.0