cpu_map: Add versions of SandyBridge CPU model

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 02e15bc0fb32d9a87c430c5c7a9bfed6b3928a9b..0b003b7e5c0e0d78f279b8871b0b879c07f1197c 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -35,6 +35,8 @@
       <include filename='x86_Westmere-IBRS.xml'/>
       <include filename='x86_SandyBridge.xml'/>
       <include filename='x86_SandyBridge-IBRS.xml'/>
+      <include filename='x86_SandyBridge-v1.xml'/>
+      <include filename='x86_SandyBridge-v2.xml'/>
       <include filename='x86_IvyBridge.xml'/>
       <include filename='x86_IvyBridge-IBRS.xml'/>
       <include filename='x86_IvyBridge-v1.xml'/>

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 5f5cbc6049d1f25cad5618ac81d07843a52728f7..de1eb8efbd5090e9d1fdd6d1e893ba622d1c2360 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -98,6 +98,8 @@ cpumap_data = [
   'x86_qemu32.xml',
   'x86_qemu64.xml',
   'x86_SandyBridge-IBRS.xml',
+  'x86_SandyBridge-v1.xml',
+  'x86_SandyBridge-v2.xml',
   'x86_SandyBridge.xml',
   'x86_SapphireRapids-v1.xml',
   'x86_SapphireRapids-v2.xml',

diff --git a/src/cpu_map/x86_SandyBridge-v1.xml b/src/cpu_map/x86_SandyBridge-v1.xml
new file mode 100644 (file)
index 0000000..eca815e
--- /dev/null
+++ b/src/cpu_map/x86_SandyBridge-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='SandyBridge-v1'>
+    <decode host='on' guest='off'/>
+    <model name='SandyBridge'/>
+  </model>
+</cpus>

diff --git a/src/cpu_map/x86_SandyBridge-v2.xml b/src/cpu_map/x86_SandyBridge-v2.xml
new file mode 100644 (file)
index 0000000..da7448e
--- /dev/null
+++ b/src/cpu_map/x86_SandyBridge-v2.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='SandyBridge-v2'>
+    <decode host='on' guest='off'/>
+    <model name='SandyBridge-IBRS'/>
+  </model>
+</cpus>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
index 4d721b4d07b637228f2aee68f1da47e5a938323e..15acb88238e95ad73538a005c16488bde2b9eea5 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>SandyBridge</model>
+  <model>SandyBridge-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='42' stepping='7'/>
   <feature name='dtes64'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
index 4d721b4d07b637228f2aee68f1da47e5a938323e..15acb88238e95ad73538a005c16488bde2b9eea5 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>SandyBridge</model>
+  <model>SandyBridge-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='42' stepping='7'/>
   <feature name='dtes64'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
index 4d721b4d07b637228f2aee68f1da47e5a938323e..15acb88238e95ad73538a005c16488bde2b9eea5 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>SandyBridge</model>
+  <model>SandyBridge-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='42' stepping='7'/>
   <feature name='dtes64'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
index 32612c78e7fc51d5c8e8d95a9f7933caf549b2e4..922a565fbff97dc08b7da2d522c3856ad176a7a8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>SandyBridge</model>
+  <model>SandyBridge-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='42' stepping='7'/>
   <feature name='dtes64'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
index 8f56d42213064823fdc5fedcabcddde1d941de44..e243de08f1fa83d494a474da2208d8987510425f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>SandyBridge-IBRS</model>
+  <model>SandyBridge-v2</model>
   <vendor>Intel</vendor>
   <signature family='6' model='45' stepping='7'/>
   <feature name='dtes64'/>

diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
index 91470f547cbc257bf5f6d020cdb72927a296d625..fef8d6b7e6a73f5294693e56fd122d6c791f56c1 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -534,11 +534,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index ea9d251170e87ce4327a9568b29c63482758ca24..ef6c42b26e5c96620cddbfc99d48ef4bcda97ec5 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -915,19 +915,32 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='avx'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='avx'/>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='avx'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='avx'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='3dnowprefetch'/>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 5595aa189f059394fae1817a1eef35cbab180ead..bf133ee52f859ac422ec3cfe791b1fc269807737 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -533,11 +533,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index 67e958139249d55469a0cb0a32efa18507af6dd3..4d70c4dff3ba8d7e73d4742ba4e6dfde3fcdc678 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -543,11 +543,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index dece2c5a51dad0982bf2e226acaf1054a9302d52..51c450070e6ded7d222a8ee3fb579a0492cedf24 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -947,19 +947,32 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='avx'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='avx'/>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='avx'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='avx'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='3dnowprefetch'/>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index b20142b754bf3eb04f7a93346085452424212c75..5aa253d292c89db35695af206e77eed4a7316471 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -542,11 +542,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index 20cf24f7d246ca83efabc612a97483856df408c6..8331b137a425e48d89219743a87a5c1bee49beda 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -607,11 +607,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index 8c105600d1b30df31df9f694de418b8e46011fa0..ffb6f8b8f5afb77c2947d4d71801ff86806dbddc 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1055,19 +1055,32 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='avx'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='avx'/>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='avx'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='avx'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='3dnowprefetch'/>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index d04712fac0c694c6c91aed80dc41de85010d7e42..5d9e5e7d0a4c9c2e9392f01315325d7f19d08ba8 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -606,11 +606,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index fcb4bc875ce3990ce2db74d203342516ed1cee40..8b5d68d86fdf2a359851dedb07afc44876fd0454 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -604,11 +604,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index 89d88b5ba63113d13827243447593b18d9cc1cbb..99aee06e01b737bef892dbb187dc88de79c58d88 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1053,19 +1053,32 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='avx'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='avx'/>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='avx'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='avx'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='3dnowprefetch'/>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index dd65742683d6336c1a759b64bb56b6f5e30c767d..eecf62e23ca0b2392e954190858a1be452f62e92 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -603,11 +603,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index 7a8c833ffb6ac340cf30e384e7400dbd8216150d..1594090e93255c975ee50e4cbdf9eab98750ada0 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -631,11 +631,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index e180310c5740722f218c5801a1f86f3db5a352da..5cbef5a3d92ac57084d7e6f9c19308c3e355b2ec 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1085,19 +1085,32 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='avx'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='avx'/>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='avx'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='avx'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='3dnowprefetch'/>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 0e273071883c9dd7ca609282e7ba604d96552fef..7686d541af5c06d39e23ca2bd6a51fd36edbf60c 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -630,11 +630,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 63b5f3daeb92181d42e6c83a4a1df656b616925c..64f907d4024180480111d316b9b5fe11c9efa073 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -598,11 +598,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index f2f45a31597bd93341a592804df660ba757b5529..2c3d3c68313756e9d065c08802b742baeef52513 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1033,19 +1033,32 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='avx'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='avx'/>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='avx'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='avx'/>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='3dnowprefetch'/>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 4596b3cfaa4eae1973e52f5cc3603554ba512d37..d44bbf5916123f4af4fe95a6f4a5e78e41fdcd66 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -597,11 +597,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
index eb02099bdd4570d6ef1f7f5ecceb8c8bf0655c0a..0c80394deb5dd27aac7d8946d1326d899dab8aad 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -603,11 +603,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index 8833bf346f4fe6e8acf6247c63f13caa9b0fa1cf..c0bccf6d631630a99243b9199aafe9786d4c1eff 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
@@ -846,17 +846,28 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='3dnowprefetch'/>

diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
index 8833bf346f4fe6e8acf6247c63f13caa9b0fa1cf..c0bccf6d631630a99243b9199aafe9786d4c1eff 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -846,17 +846,28 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='3dnowprefetch'/>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index abb210a30b055de2ada9a2639c0195968f8ee31d..495ff2a7a663c21950a4216a720ac17b1ca4efce 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -602,11 +602,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='Skylake-Client-v1'>Skylake-Client</model>
       <blockers model='Skylake-Client'>
         <feature name='erms'/>

diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
index 283617171cec352b8e0f47baf61f92c485a50dbf..14b575174ed89fd28e6a6ca1c44c06367cf2d1f6 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -603,11 +603,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
index 65e487ff9ee534699ce3be179dd9660dbf269813..5ea1d67be68f96df9fb5b8cebd9ac398b7702594 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -846,17 +846,28 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='3dnowprefetch'/>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 0760bdaac4f48c653d9602f4fd137136f13d5a52..910375f2f9a32a932d29158d47450c9c9ada05db 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -602,11 +602,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
index e1d63a90073fe29d4965ba7ad042fe9bd8935589..76d4068514f825e22b29bc95b15db6bf84b05d8f 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -741,11 +741,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
index edd510b459f37c7c5ae5b48b97b4743d27f63100..85c1c55285d4f11cf7a8fec53e522a3059a32148 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -826,17 +826,28 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index db88c10e026934dc23280468073216ca22220b36..31faf3b3480b038fc3bc58f0756e0e17744443c2 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -740,11 +740,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
index 32ca16ad7a80b7ce2b6ab294aeee872f5d5c7084..b19817918f60c3787fd2b1029207277f51900d13 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -742,11 +742,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
index bbedbc97e84f1c30fda9f5449a0a0573a7b91064..f5c4c5cde5d54136289960771f520bf1d10bdc63 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -815,17 +815,28 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
         <feature name='x2apic'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+        <feature name='x2apic'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index dbb2f570c44f846f8d6b4a6904c35270594f543e..382c098a1a7e32823fe54e49f8cb6e6fe24a8b48 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -741,11 +741,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
index 1bb022ed960a7d0510494db53db0c550fa04c099..5e8571010996dc9c6a4d15cfdeb36da260d45e24 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -742,11 +742,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
index 36e94c53322c212226e93b56e8ab0965f90188a2..003aca6d5ae3cf6e51e3a9fa2c5ab96918ade164 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -777,15 +777,24 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='tsc-deadline'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='tsc-deadline'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index 1f322d41c371cbf6ef5d829e81f7dd988d632107..be10184da3b440c77c31f742691224f34533bea8 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -741,11 +741,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
index 1a646e25eb87deaac76fdbc02a9e7c3da26875bd..eba43c60e4c3f70be4780d3d00087bca45992593 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -775,11 +775,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
index 5ed8b25139be84e7592f87f6e41af25fda984893..58bb4f9db6d3750cf5a7ceb84c092e8815a8eca4 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -802,15 +802,24 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='tsc-deadline'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='tsc-deadline'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index fa46dd5393ac4bd4dc98726f16362619a507040a..e548534e1f1d7547afa00d172a72d21b4a12123d 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -774,11 +774,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
index 3cfbed919aca1db44c6461647319cb7421b67a1e..5be67241614db94c5957020404bc876d311a4624 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -775,11 +775,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
index f6f461bbf49323622d065730f5abf75a942876e7..1eec80af8d3ccbc4793525c8afaf0cd6781b76fc 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -802,15 +802,24 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='no' vendor='Intel'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
       <blockers model='SandyBridge'>
         <feature name='tsc-deadline'/>
       </blockers>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
         <feature name='tsc-deadline'/>
       </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v1</model>
+      <blockers model='SandyBridge-v1'>
+        <feature name='tsc-deadline'/>
+      </blockers>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+        <feature name='tsc-deadline'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>

diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index f2f765ade971be152c307595564714464f9c79eb..0716a44ed532c0d4129f30f1bc61c215c0af562a 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -774,11 +774,16 @@
         <feature name='xop'/>
       </blockers>
       <model usable='yes' vendor='Intel'>Penryn</model>
-      <model usable='yes' vendor='Intel'>SandyBridge</model>
-      <model usable='no' vendor='Intel'>SandyBridge-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='SandyBridge-v1'>SandyBridge</model>
+      <model usable='no' vendor='Intel' canonical='SandyBridge-v2'>SandyBridge-IBRS</model>
       <blockers model='SandyBridge-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>SandyBridge-v1</model>
+      <model usable='no' vendor='Intel'>SandyBridge-v2</model>
+      <blockers model='SandyBridge-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='SapphireRapids-v1'>SapphireRapids</model>
       <blockers model='SapphireRapids'>
         <feature name='amx-bf16'/>