cpu_map: Add versions of Westmere 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 0b003b7e5c0e0d78f279b8871b0b879c07f1197c..1160a99ccf69f0369744dd3f8a003bf932e79f28 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -33,6 +33,8 @@
       <include filename='x86_Nehalem-IBRS.xml'/>
       <include filename='x86_Westmere.xml'/>
       <include filename='x86_Westmere-IBRS.xml'/>
+      <include filename='x86_Westmere-v1.xml'/>
+      <include filename='x86_Westmere-v2.xml'/>
       <include filename='x86_SandyBridge.xml'/>
       <include filename='x86_SandyBridge-IBRS.xml'/>
       <include filename='x86_SandyBridge-v1.xml'/>

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index de1eb8efbd5090e9d1fdd6d1e893ba622d1c2360..474f43fad527db578c855e9b603d9cf4098cd957 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -129,6 +129,8 @@ cpumap_data = [
   'x86_Snowridge.xml',
   'x86_vendors.xml',
   'x86_Westmere-IBRS.xml',
+  'x86_Westmere-v1.xml',
+  'x86_Westmere-v2.xml',
   'x86_Westmere.xml',
 ]
 

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

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

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
index c830b8a6491e563a8ec0a230fafe53bca7a87230..98718a36a5e33ddd589c9f50a96ac4676d4558ba 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Westmere-IBRS</model>
+  <model>Westmere-v2</model>
   <vendor>Intel</vendor>
   <signature family='6' model='134' stepping='5'/>
   <feature name='pclmuldq'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
index c074a5c6ecbb15440f97b1769aa57a807957df02..6d43353c87929a210b4b4860a8067304918ef247 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Westmere</model>
+  <model>Westmere-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='37' stepping='2'/>
   <feature name='pclmuldq'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
index 0e994e062350639c650ab265e4dab2a918480818..43e0257a3f3593ecb5d7e70c55e36a7f4a4cd4a2 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Westmere</model>
+  <model>Westmere-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='69' stepping='1'/>
   <feature name='pclmuldq'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
index 728c9c4264ca4aaa777553438e36e4e5c32bc376..fb4f1efc9268b5816c9ee6b84f426548a7f0048c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Westmere</model>
+  <model>Westmere-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='47' stepping='2'/>
   <feature name='pclmuldq'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
index 728c9c4264ca4aaa777553438e36e4e5c32bc376..fb4f1efc9268b5816c9ee6b84f426548a7f0048c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Westmere</model>
+  <model>Westmere-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='47' stepping='2'/>
   <feature name='pclmuldq'/>

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 fef8d6b7e6a73f5294693e56fd122d6c791f56c1..f28fc3588a3158f6e4b69558eed84cdf263ff1b2 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -724,11 +724,16 @@
         <feature name='spec-ctrl'/>
         <feature name='split-lock-detect'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 ef6c42b26e5c96620cddbfc99d48ef4bcda97ec5..1a6022cf187fd72e84a6a47bb07a272de56d5610 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1240,11 +1240,16 @@
         <feature name='x2apic'/>
         <feature name='xsavec'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index bf133ee52f859ac422ec3cfe791b1fc269807737..0ddb5d74110d07daa3d643a247d773746774b868 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -723,11 +723,16 @@
         <feature name='spec-ctrl'/>
         <feature name='split-lock-detect'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 4d70c4dff3ba8d7e73d4742ba4e6dfde3fcdc678..47fb80dbb5aeff6e3703865a1ab70d9b58f7665f 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -733,11 +733,16 @@
         <feature name='spec-ctrl'/>
         <feature name='split-lock-detect'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 51c450070e6ded7d222a8ee3fb579a0492cedf24..b0320b8bb0495ce96171c42277da6b4b0e0e3023 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1272,11 +1272,16 @@
         <feature name='x2apic'/>
         <feature name='xsavec'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 5aa253d292c89db35695af206e77eed4a7316471..0a043647854368cd57f004c329cd3c68360639e8 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -732,11 +732,16 @@
         <feature name='spec-ctrl'/>
         <feature name='split-lock-detect'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 8331b137a425e48d89219743a87a5c1bee49beda..2ab2725264dbdeee9ea04aa373cf5bbacdb124e4 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -828,11 +828,16 @@
         <feature name='spec-ctrl'/>
         <feature name='split-lock-detect'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 ffb6f8b8f5afb77c2947d4d71801ff86806dbddc..01e32438395b8545bc1ae565ff960f8029286f84 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1437,11 +1437,16 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 5d9e5e7d0a4c9c2e9392f01315325d7f19d08ba8..a33227c9e7f15df96d3fadc3b0fa1f168b1c0e3f 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -827,11 +827,16 @@
         <feature name='spec-ctrl'/>
         <feature name='split-lock-detect'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 8b5d68d86fdf2a359851dedb07afc44876fd0454..32d9396f7ed93330aa37c49ee7aba8f890acd297 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -834,11 +834,16 @@
         <feature name='movdiri'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 99aee06e01b737bef892dbb187dc88de79c58d88..4373491a969dbd1695978078445f9f4104a8150f 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1453,11 +1453,16 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index eecf62e23ca0b2392e954190858a1be452f62e92..df66a60087afb7503f370c4252593ebc7793df54 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -833,11 +833,16 @@
         <feature name='movdiri'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 1594090e93255c975ee50e4cbdf9eab98750ada0..8e6af2e612fd2247b6d78226f2aec11c376ee382 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -861,11 +861,16 @@
         <feature name='movdiri'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 5cbef5a3d92ac57084d7e6f9c19308c3e355b2ec..f3a17b9cdcbe789c0a9da36e1bb48b6f06033d5d 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1480,11 +1480,16 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 7686d541af5c06d39e23ca2bd6a51fd36edbf60c..35c97e9653309a61f9455acc6f76a59066bce6cb 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -860,11 +860,16 @@
         <feature name='movdiri'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 64f907d4024180480111d316b9b5fe11c9efa073..d9941ac903543c69fc1a1b9f8cbc4bcfaca54983 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -828,11 +828,16 @@
         <feature name='movdiri'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 2c3d3c68313756e9d065c08802b742baeef52513..2cb556304c34c8c5c8994d79449d79000a88650f 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1428,11 +1428,16 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index d44bbf5916123f4af4fe95a6f4a5e78e41fdcd66..08f52237236660f77028f6c50573b7c733c103bc 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -827,11 +827,16 @@
         <feature name='movdiri'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 0c80394deb5dd27aac7d8946d1326d899dab8aad..21e3d6cdd2e65fdc6a5d0f2d9018a7c1a30d085d 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -833,11 +833,16 @@
         <feature name='movdiri'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 c0bccf6d631630a99243b9199aafe9786d4c1eff..8efb91b8d20538a1c385b33db4c28e8df57a6cd7 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
@@ -1177,11 +1177,16 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

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 c0bccf6d631630a99243b9199aafe9786d4c1eff..8efb91b8d20538a1c385b33db4c28e8df57a6cd7 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1177,11 +1177,16 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 495ff2a7a663c21950a4216a720ac17b1ca4efce..244c60638b01c0936cb401cbb2cfb7753972a54e 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -832,11 +832,16 @@
         <feature name='movdiri'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 14b575174ed89fd28e6a6ca1c44c06367cf2d1f6..4da4c9502bebf18d0f4df9307f52c11453285c72 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -915,11 +915,16 @@
         <feature name='movdiri'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 5ea1d67be68f96df9fb5b8cebd9ac398b7702594..7a14b52628a40a47c6a10c74156d57344b84336c 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1273,11 +1273,16 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 910375f2f9a32a932d29158d47450c9c9ada05db..bb63910270cf031124c5e47f0662b04dbcfdd875 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -914,11 +914,16 @@
         <feature name='movdiri'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 76d4068514f825e22b29bc95b15db6bf84b05d8f..0590aadff036fa81410ad82b835ff6e8d9b514cc 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -1104,11 +1104,16 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 85c1c55285d4f11cf7a8fec53e522a3059a32148..ddf0837a3ee33641a858f1789f3be45c55ec215d 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1231,11 +1231,16 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 31faf3b3480b038fc3bc58f0756e0e17744443c2..cb7724308b57d317f8fff4e5da6b7311fda5d53b 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -1103,11 +1103,16 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 b19817918f60c3787fd2b1029207277f51900d13..ece4b0e9dff37fe526e6f50c2e9424511ffa00ee 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -1105,11 +1105,16 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 f5c4c5cde5d54136289960771f520bf1d10bdc63..828cbe069acd7422b69a9795dd0a25af415e1748 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1212,11 +1212,16 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 382c098a1a7e32823fe54e49f8cb6e6fe24a8b48..da9d657b8e35c0b8efccc36dc06a53a89573a17d 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -1104,11 +1104,16 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 5e8571010996dc9c6a4d15cfdeb36da260d45e24..ac6b431057df0690a6022f0c6deba282c52723b2 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -1105,11 +1105,16 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 003aca6d5ae3cf6e51e3a9fa2c5ab96918ade164..a63f5a50602f46e79e8def9a5c2c37c3437ed39a 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -1147,11 +1147,16 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index be10184da3b440c77c31f742691224f34533bea8..ac2c018ccf3abb015681f39f9d85a1aca60e97c4 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -1104,11 +1104,16 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 eba43c60e4c3f70be4780d3d00087bca45992593..cf24a9879308fe73b475d54f177124273bb33fc1 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -1241,11 +1241,16 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 58bb4f9db6d3750cf5a7ceb84c092e8815a8eca4..c396fb8eed8b6bd631664073a0f03498769ea45f 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1252,11 +1252,16 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index e548534e1f1d7547afa00d172a72d21b4a12123d..d6905fe9037446e161e32e7d630581001abd3be4 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -1240,11 +1240,16 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 5be67241614db94c5957020404bc876d311a4624..21affa5e6727341e68d54fb5180146ffbf465cbb 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -1241,11 +1241,16 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>

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 1eec80af8d3ccbc4793525c8afaf0cd6781b76fc..c6f1732275a3abe2b507474f5d6e0aec18390c6d 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1252,11 +1252,16 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
       <model usable='yes' vendor='Intel'>coreduo</model>

diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 0716a44ed532c0d4129f30f1bc61c215c0af562a..ca506076a859d9c2a03356b219d2bf4a80427229 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -1240,11 +1240,16 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Westmere</model>
-      <model usable='no' vendor='Intel'>Westmere-IBRS</model>
+      <model usable='yes' vendor='Intel' canonical='Westmere-v1'>Westmere</model>
+      <model usable='no' vendor='Intel' canonical='Westmere-v2'>Westmere-IBRS</model>
       <blockers model='Westmere-IBRS'>
         <feature name='spec-ctrl'/>
       </blockers>
+      <model usable='yes' vendor='Intel'>Westmere-v1</model>
+      <model usable='no' vendor='Intel'>Westmere-v2</model>
+      <blockers model='Westmere-v2'>
+        <feature name='spec-ctrl'/>
+      </blockers>
       <model usable='no' vendor='AMD'>athlon</model>
       <blockers model='athlon'>
         <feature name='3dnow'/>