From 93520cb5f3b412c8cb4b5cf7098ff4a8c6c819ab Mon Sep 17 00:00:00 2001

Message-Id: <93520cb5f3b412c8cb4b5cf7098ff4a8c6c819ab@dist-git>

From: Jiri Denemark <jdenemar@redhat.com>

Date: Fri, 21 Jun 2019 09:25:09 +0200

Subject: [PATCH] cpu_map: Add more signatures for Conroe CPU model

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 c1f6a3269c595e7d3d0c9cf31ef7e6cf88291056)

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

Conflicts:

	src/cpu_map/x86_Conroe.xml

            - cpu_map split not backported

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

Message-Id: <bdc4e7ff05e41cf66f69b61c0c622740f710d411.1561068591.git.jdenemar@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 src/cpu/cpu_map.xml | 1 +

 1 file changed, 1 insertion(+)

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml

index a5a5290a09..1699aec2cf 100644

--- a/src/cpu/cpu_map.xml

+++ b/src/cpu/cpu_map.xml

@@ -829,6 +829,7 @@

     <model name='Conroe'>

       <signature family='6' model='15'/> 

+      <signature family='6' model='22'/> 

       <vendor name='Intel'/>

       <feature name='apic'/>

       <feature name='clflush'/>

-- 

2.22.0