cpu_map: Add support for core-capability CPU feature

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index b0bf22d91670db9142efebb89579572d61d74491..a5a987debaac7d01f0d774678fdaea11188cb504 100644 (file)
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -357,6 +357,9 @@
   <feature name='arch-capabilities'> <!-- arch_capabilities, arch-facilities -->
     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x20000000'/>
   </feature>
+  <feature name='core-capability'>
+    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x40000000'/>
+  </feature>
   <feature name='ssbd'>
     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/>
   </feature>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
index 842c7b4a2af02465bfd43131569b5ff836028709..50e808414061a6a88ed8358972b2da93aa554324 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
@@ -1,7 +1,7 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch='x86'>
   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x080041dc' edx='0xb0600000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000020' edx='0x00000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000020' edx='0x40000000'/>
   <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
   <msr index='0x10a' edx='0x00000000' eax='0x00000100'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
index 0f3e2e506e531ad34545eaf0fcc31a0e6394a455..4ad95f06b4e74af0d9fd559142278653297dbedf 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
@@ -37,6 +37,7 @@
   <feature policy='require' name='md-clear'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='arch-capabilities'/>
+  <feature policy='require' name='core-capability'/>
   <feature policy='require' name='ssbd'/>
   <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='xsavec'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
index 3bd009c1da2192d0ad0309e6780feaa3e6956674..cc2b208e6af4feca2740a950d7b05f3a10c39d7e 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
@@ -47,6 +47,7 @@
   <feature name='md-clear'/>
   <feature name='stibp'/>
   <feature name='arch-capabilities'/>
+  <feature name='core-capability'/>
   <feature name='ssbd'/>
   <feature name='xsaveopt'/>
   <feature name='xsavec'/>