cpu_map: Add more signatures for Broadwell CPU models

This fixes several CPUs which were incorrectly detected as
Skylake-Client.
Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>

src/cpu_map/x86_Broadwell-IBRS.xml

 <cpus>
   <model name='Broadwell-IBRS'>
     <signature family='6' model='61'/> <!-- 0306d0 -->
+    <signature family='6' model='71'/> <!-- 040670 -->
+    <signature family='6' model='79'/> <!-- 0406f0 -->
+    <signature family='6' model='86'/> <!-- 050660 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='adx'/>

src/cpu_map/x86_Broadwell-noTSX-IBRS.xml

 <cpus>
   <model name='Broadwell-noTSX-IBRS'>
     <signature family='6' model='61'/> <!-- 0306d0 -->
+    <signature family='6' model='71'/> <!-- 040670 -->
+    <signature family='6' model='79'/> <!-- 0406f0 -->
+    <signature family='6' model='86'/> <!-- 050660 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='adx'/>

src/cpu_map/x86_Broadwell-noTSX.xml

 <cpus>
   <model name='Broadwell-noTSX'>
     <signature family='6' model='61'/> <!-- 0306d0 -->
+    <signature family='6' model='71'/> <!-- 040670 -->
+    <signature family='6' model='79'/> <!-- 0406f0 -->
+    <signature family='6' model='86'/> <!-- 050660 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='adx'/>

src/cpu_map/x86_Broadwell.xml

 <cpus>
   <model name='Broadwell'>
     <signature family='6' model='61'/> <!-- 0306d0 -->
+    <signature family='6' model='71'/> <!-- 040670 -->
+    <signature family='6' model='79'/> <!-- 0406f0 -->
+    <signature family='6' model='86'/> <!-- 050660 -->
     <vendor name='Intel'/>
     <feature name='3dnowprefetch'/>
     <feature name='adx'/>

tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml

 <cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Skylake-Client-IBRS</model>
+  <model fallback='forbid'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
   <feature policy='require' name='ds'/>
   <feature policy='require' name='acpi'/>
   <feature policy='require' name='ss'/>
@@ -18,15 +19,17 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='intel-pt'/>
   <feature policy='require' name='stibp'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='mbm_total'/>
   <feature policy='require' name='mbm_local'/>
   <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
   <feature policy='require' name='invtsc'/>
-  <feature policy='disable' name='mpx'/>
-  <feature policy='disable' name='xsavec'/>
-  <feature policy='disable' name='xgetbv1'/>
 </cpu>

tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml

 <cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Skylake-Client-IBRS</model>
+  <model fallback='forbid'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
   <feature policy='require' name='ss'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
-  <feature policy='disable' name='mpx'/>
-  <feature policy='disable' name='xsavec'/>
-  <feature policy='disable' name='xgetbv1'/>
+  <feature policy='require' name='abm'/>
 </cpu>

tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml

 <cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Skylake-Client</model>
+  <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
   <feature policy='require' name='ds'/>
   <feature policy='require' name='acpi'/>
   <feature policy='require' name='ss'/>
@@ -18,14 +19,16 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='intel-pt'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='mbm_total'/>
   <feature policy='require' name='mbm_local'/>
   <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
   <feature policy='require' name='invtsc'/>
-  <feature policy='disable' name='mpx'/>
-  <feature policy='disable' name='xsavec'/>
-  <feature policy='disable' name='xgetbv1'/>
 </cpu>

tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml

 <cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Skylake-Client</model>
+  <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
   <feature policy='require' name='ss'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
-  <feature policy='disable' name='mpx'/>
-  <feature policy='disable' name='xsavec'/>
-  <feature policy='disable' name='xgetbv1'/>
+  <feature policy='require' name='abm'/>
 </cpu>

tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml

 <cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Skylake-Client</model>
+  <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
   <feature policy='require' name='ds'/>
   <feature policy='require' name='acpi'/>
   <feature policy='require' name='ss'/>
@@ -18,14 +19,16 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
+  <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='intel-pt'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='mbm_total'/>
   <feature policy='require' name='mbm_local'/>
   <feature policy='require' name='pdpe1gb'/>
+  <feature policy='require' name='abm'/>
   <feature policy='require' name='invtsc'/>
-  <feature policy='disable' name='mpx'/>
-  <feature policy='disable' name='xsavec'/>
-  <feature policy='disable' name='xgetbv1'/>
 </cpu>

tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml

 <cpu mode='custom' match='exact'>
-  <model fallback='forbid'>Skylake-Client</model>
+  <model fallback='forbid'>Broadwell</model>
   <vendor>Intel</vendor>
+  <feature policy='require' name='vme'/>
   <feature policy='require' name='ss'/>
+  <feature policy='require' name='f16c'/>
+  <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
+  <feature policy='require' name='arat'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
-  <feature policy='disable' name='mpx'/>
-  <feature policy='disable' name='xsavec'/>
-  <feature policy='disable' name='xgetbv1'/>
+  <feature policy='require' name='abm'/>
 </cpu>