cpu_map: Add missing x86 feature "sgxlc"

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 a98da910c98805753ef41ac8cda52f94432de165..c9935a0ef95d0c96bb045f9f71a6c3e74312f46d 100644 (file)
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -343,6 +343,9 @@
   <feature name='movdir64b'>
     <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x10000000'/>
   </feature>
+  <feature name='sgxlc'>
+    <cpuid eax_in='0x07' ecx_in='0x00' ecx='0x40000000'/>
+  </feature>
 
   <feature name='avx512-4vnniw'>
     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000004'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
index 3a2308155cdf7baae556d51bbd354f7b429d357b..bffdae01dad331da68ab94beee8410ab8aa7157e 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
@@ -1,6 +1,6 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch='x86'>
   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000004' ecx='0x00000000' edx='0x08000000'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000004' ecx='0x40000000' edx='0x08000000'/>
   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
index 5cf7778d55b23d5a22bf3cd824d9f89903a6cbd6..99874701de48c6684cc07b9fda6940ecedcf61f4 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
@@ -21,6 +21,7 @@
   <feature policy='require' name='sgx'/>
   <feature policy='require' name='clflushopt'/>
   <feature policy='require' name='intel-pt'/>
+  <feature policy='require' name='sgxlc'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='ssbd'/>
   <feature policy='require' name='xsaves'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
index 00fa4024742d35b20e296346083b16eb167fb79f..8e5cab50bbc17f1e26f41c19e7b9d617edabe6dc 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
@@ -23,6 +23,7 @@
   <feature name='sgx'/>
   <feature name='clflushopt'/>
   <feature name='intel-pt'/>
+  <feature name='sgxlc'/>
   <feature name='stibp'/>
   <feature name='ssbd'/>
   <feature name='xsaves'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
index 939506ef89e3485f325182162db5f6ef425fd7df..2769427a8515f003375762a1c08fb7fa78171a56 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-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='0x0804c1fc' edx='0xb0600000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001004' ecx='0x00400010' edx='0x00000010'/>
+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001004' ecx='0x40400010' edx='0x00000010'/>
   <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'/>
 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
index b8163103680cb68dca1d0cd98feb15a9de6be5d5..13147e354e35751868052be592d97e198da766fe 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
@@ -26,6 +26,7 @@
   <feature policy='require' name='sha-ni'/>
   <feature policy='require' name='ospke'/>
   <feature policy='require' name='rdpid'/>
+  <feature policy='require' name='sgxlc'/>
   <feature policy='require' name='fsrm'/>
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='arch-capabilities'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
index ce81ad0ec21414a641a6b9fb16944ce4a12ea373..aa2514eb60adb23cde39ec77e009e206d3c26a2e 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
@@ -28,6 +28,7 @@
   <feature name='sha-ni'/>
   <feature name='ospke'/>
   <feature name='rdpid'/>
+  <feature name='sgxlc'/>
   <feature name='fsrm'/>
   <feature name='stibp'/>
   <feature name='arch-capabilities'/>