From 6dd5910da790d936abcf439e41fad38d5528eb50 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 23 May 2016 17:57:39 +0200
Subject: [PATCH] cpu: Add x86 feature flags for CPUID leaf 0xd, sub leaf 1

This was implemented in QEMU by commit 0bb0b2d2fe7f645dda.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/cpu/cpu_map.xml                                | 14 ++++++++++++++
 tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml |  1 +
 tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml  |  1 +
 tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml  |  1 +
 .../cputestdata/x86-cpuid-Core-i5-2540M-guest.xml  |  1 +
 tests/cputestdata/x86-cpuid-Core-i5-2540M-host.xml |  1 +
 tests/cputestdata/x86-cpuid-Core-i5-2540M-json.xml |  1 +
 tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml |  1 +
 tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml |  4 ++++
 tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml  |  4 ++++
 tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml  |  4 ++++
 tests/cputestdata/x86-cpuid-Core-i7-2600-guest.xml |  1 +
 tests/cputestdata/x86-cpuid-Core-i7-2600-host.xml  |  1 +
 tests/cputestdata/x86-cpuid-Core-i7-2600-json.xml  |  1 +
 .../cputestdata/x86-cpuid-Core-i7-3520M-guest.xml  |  1 +
 tests/cputestdata/x86-cpuid-Core-i7-3520M-host.xml |  1 +
 .../cputestdata/x86-cpuid-Core-i7-3740QM-json.xml  |  1 +
 tests/cputestdata/x86-cpuid-Core-i7-3770-guest.xml |  1 +
 tests/cputestdata/x86-cpuid-Core-i7-3770-host.xml  |  1 +
 tests/cputestdata/x86-cpuid-Core-i7-3770-json.xml  |  1 +
 .../cputestdata/x86-cpuid-Core-i7-4600U-guest.xml  |  1 +
 tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml |  1 +
 tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml |  1 +
 .../cputestdata/x86-cpuid-Core-i7-5600U-guest.xml  |  1 +
 tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml |  1 +
 tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml |  1 +
 tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml |  4 ++++
 tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml  |  4 ++++
 tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml  |  3 +++
 tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml |  1 +
 tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml  |  1 +
 tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml  |  1 +
 tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml |  1 +
 tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml  |  1 +
 34 files changed, 64 insertions(+)

diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
index b742122983..68cb500209 100644
--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
@@ -247,6 +247,20 @@
       <cpuid eax_in='0x07' ebx='0x10000000'/>
     </feature>
 
+    <!-- Processor Extended State Enumeration sub leaf 1 -->
+    <feature name='xsaveopt'>
+      <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000001'/>
+    </feature>
+    <feature name='xsavec'>
+      <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000002'/>
+    </feature>
+    <feature name='xgetbv1'>
+      <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000004'/>
+    </feature>
+    <feature name='xsaves' migratable='no'>
+      <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000008'/>
+    </feature>
+
     <!-- extended features, EDX -->
     <feature name='syscall'> <!-- CPUID_EXT2_SYSCALL -->
       <cpuid eax_in='0x80000001' edx='0x00000800'/>
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml
index d12df2d609..6e60106307 100644
--- a/tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml
@@ -20,5 +20,6 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml b/tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml
index 5572ba5de6..e862e82607 100644
--- a/tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml
@@ -20,5 +20,6 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='osxsave'/>
+  <feature name='xsaveopt'/>
   <feature name='invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml
index a2ecde6ba9..27d9f35805 100644
--- a/tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml
@@ -6,4 +6,5 @@
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-2540M-guest.xml
index d12df2d609..6e60106307 100644
--- a/tests/cputestdata/x86-cpuid-Core-i5-2540M-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-2540M-guest.xml
@@ -20,5 +20,6 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M-host.xml b/tests/cputestdata/x86-cpuid-Core-i5-2540M-host.xml
index 5572ba5de6..e862e82607 100644
--- a/tests/cputestdata/x86-cpuid-Core-i5-2540M-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-2540M-host.xml
@@ -20,5 +20,6 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='osxsave'/>
+  <feature name='xsaveopt'/>
   <feature name='invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-2540M-json.xml
index a2ecde6ba9..27d9f35805 100644
--- a/tests/cputestdata/x86-cpuid-Core-i5-2540M-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-2540M-json.xml
@@ -6,4 +6,5 @@
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml
index 1c2aad31e6..c93688b894 100644
--- a/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml
@@ -8,6 +8,7 @@
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml
index 782000781e..cb8bd7607e 100644
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml
@@ -24,6 +24,10 @@
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='mpx'/>
   <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='xsavec'/>
+  <feature policy='require' name='xgetbv1'/>
+  <feature policy='require' name='xsaves'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
   <feature policy='require' name='invtsc'/>
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml
index bdf38d9b25..1f24dd8883 100644
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml
@@ -24,6 +24,10 @@
   <feature name='tsc_adjust'/>
   <feature name='mpx'/>
   <feature name='clflushopt'/>
+  <feature name='xsaveopt'/>
+  <feature name='xsavec'/>
+  <feature name='xgetbv1'/>
+  <feature name='xsaves'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>
   <feature name='invtsc'/>
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml b/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml
index 5409852391..a17b42aab5 100644
--- a/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml
@@ -9,6 +9,10 @@
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='mpx'/>
   <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='xsavec'/>
+  <feature policy='require' name='xgetbv1'/>
+  <feature policy='require' name='xsaves'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-2600-guest.xml
index d12df2d609..6e60106307 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-2600-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-2600-guest.xml
@@ -20,5 +20,6 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-2600-host.xml
index 5572ba5de6..e862e82607 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-2600-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-2600-host.xml
@@ -20,5 +20,6 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='osxsave'/>
+  <feature name='xsaveopt'/>
   <feature name='invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-2600-json.xml
index a2ecde6ba9..27d9f35805 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-2600-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-2600-json.xml
@@ -6,4 +6,5 @@
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3520M-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-3520M-guest.xml
index f5125d47ce..61c058fd6c 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-3520M-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-3520M-guest.xml
@@ -19,5 +19,6 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3520M-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-3520M-host.xml
index 80d3a9d820..6c8a0f80ec 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-3520M-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-3520M-host.xml
@@ -19,5 +19,6 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='osxsave'/>
+  <feature name='xsaveopt'/>
   <feature name='invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3740QM-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-3740QM-json.xml
index 64e1fc9c23..9adeecc807 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-3740QM-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-3740QM-json.xml
@@ -6,4 +6,5 @@
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-3770-guest.xml
index f5125d47ce..61c058fd6c 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-3770-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-3770-guest.xml
@@ -19,5 +19,6 @@
   <feature policy='require' name='pdcm'/>
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='osxsave'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-3770-host.xml
index 80d3a9d820..6c8a0f80ec 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-3770-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-3770-host.xml
@@ -19,5 +19,6 @@
   <feature name='pdcm'/>
   <feature name='pcid'/>
   <feature name='osxsave'/>
+  <feature name='xsaveopt'/>
   <feature name='invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-3770-json.xml
index 9b4086eaa7..a70ae4866e 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-3770-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-3770-json.xml
@@ -5,4 +5,5 @@
   <feature policy='require' name='pcid'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
index 40cf4c2b3d..d06e8d9ff8 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
@@ -22,6 +22,7 @@
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
   <feature policy='require' name='invtsc'/>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
index c5a410cdde..fc033e6046 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
@@ -22,6 +22,7 @@
   <feature name='f16c'/>
   <feature name='rdrand'/>
   <feature name='tsc_adjust'/>
+  <feature name='xsaveopt'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>
   <feature name='invtsc'/>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
index ef49a38e58..b52e463af0 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
@@ -8,6 +8,7 @@
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml
index a538f74c34..91370c2dcc 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml
@@ -22,6 +22,7 @@
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
   <feature policy='require' name='invtsc'/>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml
index 9c7c791cf5..276b5afa61 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml
@@ -22,6 +22,7 @@
   <feature name='f16c'/>
   <feature name='rdrand'/>
   <feature name='tsc_adjust'/>
+  <feature name='xsaveopt'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>
   <feature name='invtsc'/>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml b/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml
index bbe5c77bc6..67b48ec5f8 100644
--- a/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml
+++ b/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml
@@ -8,6 +8,7 @@
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml
index 782000781e..cb8bd7607e 100644
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml
@@ -24,6 +24,10 @@
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='mpx'/>
   <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='xsavec'/>
+  <feature policy='require' name='xgetbv1'/>
+  <feature policy='require' name='xsaves'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
   <feature policy='require' name='invtsc'/>
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml
index bdf38d9b25..1f24dd8883 100644
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml
@@ -24,6 +24,10 @@
   <feature name='tsc_adjust'/>
   <feature name='mpx'/>
   <feature name='clflushopt'/>
+  <feature name='xsaveopt'/>
+  <feature name='xsavec'/>
+  <feature name='xgetbv1'/>
+  <feature name='xsaves'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>
   <feature name='invtsc'/>
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml
index 93483349e0..5b9cffe6fa 100644
--- a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml
@@ -10,6 +10,9 @@
   <feature policy='require' name='tsc_adjust'/>
   <feature policy='require' name='mpx'/>
   <feature policy='require' name='clflushopt'/>
+  <feature policy='require' name='xsaveopt'/>
+  <feature policy='require' name='xsavec'/>
+  <feature policy='require' name='xgetbv1'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
index 048161e70d..e5f69e8ebc 100644
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
@@ -23,6 +23,7 @@
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
   <feature policy='require' name='invtsc'/>
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
index f2cf8ccbeb..139383245c 100644
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
@@ -23,6 +23,7 @@
   <feature name='f16c'/>
   <feature name='rdrand'/>
   <feature name='tsc_adjust'/>
+  <feature name='xsaveopt'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>
   <feature name='invtsc'/>
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml
index 62aa9a1710..6b4edc3899 100644
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml
@@ -7,6 +7,7 @@
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='hypervisor'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml
index 048161e70d..e5f69e8ebc 100644
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml
@@ -23,6 +23,7 @@
   <feature policy='require' name='f16c'/>
   <feature policy='require' name='rdrand'/>
   <feature policy='require' name='tsc_adjust'/>
+  <feature policy='require' name='xsaveopt'/>
   <feature policy='require' name='pdpe1gb'/>
   <feature policy='require' name='abm'/>
   <feature policy='require' name='invtsc'/>
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml
index f2cf8ccbeb..139383245c 100644
--- a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml
+++ b/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml
@@ -23,6 +23,7 @@
   <feature name='f16c'/>
   <feature name='rdrand'/>
   <feature name='tsc_adjust'/>
+  <feature name='xsaveopt'/>
   <feature name='pdpe1gb'/>
   <feature name='abm'/>
   <feature name='invtsc'/>