cpu_map: Add n270-v1 CPU model

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index d8df3b214d5c9dbdc16cdb7bff9d11f6c47e21da..9534e5f308b110fdddc93d897c5bc5956ca4eb7b 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -19,6 +19,7 @@
       <include filename='x86_coreduo.xml'/>
       <include filename='x86_coreduo-v1.xml'/>
       <include filename='x86_n270.xml'/>
+      <include filename='x86_n270-v1.xml'/>
       <include filename='x86_core2duo.xml'/>
     </group>
 

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 1213f6929c5a8af06245d35a5bc3f5d3dd8f0fc9..5e85e24eb9e1398f3d658990270a3524868efc56 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -100,6 +100,7 @@ cpumap_data = [
   'x86_KnightsMill.xml',
   'x86_kvm32.xml',
   'x86_kvm64.xml',
+  'x86_n270-v1.xml',
   'x86_n270.xml',
   'x86_Nehalem-IBRS.xml',
   'x86_Nehalem-v1.xml',

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

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
index 1e9c6782e9873cbdda16e14af72ece25acb1d29b..10797e0633475b6767526d08e7c100134130f4f8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>n270</model>
+  <model>n270-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='28' stepping='10'/>
   <feature name='dtes64'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
index 4856cf53c40d1e7ca31f36c00f50618c3025ea85..498863b3edc1cbbdb991640ca4fdf47d3f7a0e88 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>n270</model>
+  <model>n270-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='28' stepping='10'/>
   <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 cb6db8f83c01aa401dbf0eae8f412a821fea2b8b..1ba8a7eb1134e36ed627e11cd625602303937e07 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -793,10 +793,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 36625a07b3f79a427c4c8c80adf4bcfeb956bec7..1abbfcc4bb3a8a2db571bef4ff9088f9e1a53da2 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1417,7 +1417,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index fcd76f9bc8d994eb8abce7d203c050141d5d4e39..3040deeb50cf8a64e2372625fdc4773e845fa1d4 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -792,10 +792,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 4b2d94b281370cd681d9a43cc0a178d2b3298be8..cb59946b78b5ac55311f0cc24d6e0e704fb3deaf 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -815,10 +815,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 b20dbe72c1917914546ab260be51b691fa053133..e6165eab77545a3d6b85890d67f66c12715c61ed 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1507,7 +1507,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index ad3be2108544e465a54bb3978ed07479bc0def6b..5aae9a3fcaf32ce215ac95e1f893a5e87dc5eba9 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -814,10 +814,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 a76f03f9101a830052dcc762b6f24141aa1ab17a..2898e56b413aabf0c771d4d09e2022bd413d8e54 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -916,10 +916,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 da44554a73ef14441e11152aebf87eed42fe71aa..2b5baf0a02675b9afb55b529ec8ac0394cb1059c 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1704,7 +1704,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 4369595b2e6ec7b30a3ea48504e87d21a5a9bb6d..0fd3e38ee6021b02b30fef5b0a301c20266b1ab4 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -915,10 +915,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 dc6dd2f7433174fb60b05b9d77aabde1c83bb653..690959d35a755155b92cd5623fd7796cf65ffaa7 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -922,10 +922,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 d8bb03fbfdf4776dd0740b11a675e9e7c0212c3d..6153d8a9ee95eab1100f3083761830ed1543d17c 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1719,7 +1719,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 69afbc55f0eeaf36af70d08c1c9f65372d583ba2..15edc7e73d00e5949bf42a9aebc98545bf25e507 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -921,10 +921,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 0798ee74dec0f7710d4d8228c09abe5307081fae..a1f68beb2a65a64ec788cb7afa0d30e35b825677 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -949,10 +949,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 07bbd505fab4cc66d8e6d682e0519ab91ab1aa60..9eda36d3c8b1d0c56577e61bfeba82671bf782b9 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1743,7 +1743,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index bf07fa3f5108469d29884b7de89dcc116f309cdc..249baa13429a6875ec9e5d33feb1ea0d2cfb5611 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -948,10 +948,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 694561221fffb210c5009efe34d6a7cd8f8f473b..b65196f979885f3347ec249036a52a5fb6f1ee61 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -916,10 +916,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 d98b89594037cec3e3dc5a26ea3559b4667b7af0..84df14bc63eb235cb90a5d673e30749be4ed64a1 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1691,7 +1691,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index e02f39bdf5cc8cff2308ac3180f60f3309b9ebdb..2e41f4a73aadff66491c89558852087e443069b9 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -915,10 +915,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 faa838ee4baa7f3f098834a756bc892dce311d82..ca8391756b69f02831bb3efc2d2ee9e152a70093 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -921,10 +921,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 c65ffc40bbef4bd5ca04d79d190252db3f9af22e..258212d852e7b5fee3e83d50a7d9c373915e5075 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
@@ -1404,7 +1404,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</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 c65ffc40bbef4bd5ca04d79d190252db3f9af22e..258212d852e7b5fee3e83d50a7d9c373915e5075 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1404,7 +1404,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 0a88511093ca46683050e3659cec2e4f2e324b83..819010acff75d6d31cc400c715609898452f25a3 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -920,10 +920,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 e931d7445d679550f9b28c1837cd19e16eb3e7b3..68b11921533d7861d5420237c4010034398c60ae 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -1003,10 +1003,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 c0cc453fd12ac992a898b3f75bd166157878ae6d..ea0bc81beae2a72162a64fae2eb8f4b5ca809c32 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1499,7 +1499,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 59c36bfa49875d05024695c31b7dde5ae665d99f..bddb1413a1044e43b99084e8dcf19c49558ce18e 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -1002,10 +1002,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 f822c040de80f111b5b5cc099afa509d151e9713..7f1f4a2082c3f3617c71f37bb165e1bea2904129 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -1232,10 +1232,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 7ea876c1fc7f1723fd6350a70de66d402970f29e..e2fc678bb6f0bd359884e3b03763a82642eebc1a 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1485,7 +1485,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 56a57665f18f49b654f105e375c9abb21b451fa4..4b0aed148dbcd2a55cdde19a8dfe216c1da9cce4 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -1231,10 +1231,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 d2e14fcaabee938a03440525b4a65499c7793fea..ab371ea688a35185c8abc6c86f19cd9edf353c4f 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -1233,10 +1233,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 25fe5a3f489967289f578d191bc8f74c3e57efcb..a256fed6d7c82317854de5b2f7181d14cb04c6de 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1452,7 +1452,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index dfcbcf2477640cff3b1aa46c6b80cc27e2da54a0..3f952bb3792afdec07a234b1a83718053a07de3a 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -1232,10 +1232,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 7b20023b1913125efe2d48c1081e0f561a9fb99b..21358e340aa53711d8ddd4a5964e50f71128540c 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -1233,10 +1233,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 ee58ddff1d57be181a9f54a2e34a8031a5cb88bc..d34524193a93b1c9dae4a45fd2e6e1f9ee460f41 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -1382,7 +1382,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index d2f19183f0170fd4ca2d32e8809df85c32d22fd2..9bbb95c0cb2b0fe357975059e056c63186fd93f9 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -1232,10 +1232,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 3e3bd2b5e103519488cb38c1255f43bd96acd624..c5cbe2d855c7a0d4487424f700184f974260e0a3 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -1369,10 +1369,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 f4e8163256dffcd67c54d5ef26a1863c80647170..3ec8575cf4d1f8c2892e1aa90f79ed517a339459 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1487,7 +1487,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 54d5323f713ea176cf64e24b7b91713475681cdb..513f4486cb75c5ca706ae4c4556e33a649ec58da 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -1368,10 +1368,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 b9697229d9e20f90cff3e12c74dd52cc8878b4c4..089ab497e07b4c869d4f6d9e5490066af455c7a4 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -1369,10 +1369,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

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 cc672be9a1ceaa24ddf4b5a2aa53837ccbdfcef8..64e893116acd89be450178837a09c37024121b48 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1487,7 +1487,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='yes' vendor='Intel'>n270</model>
+      <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
+      <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>

diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index c29d1e99bcf59cb55980ad8f376805dab7447fea..6e4f518b235a53b14bc899ada5c7df882d5683e4 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -1368,10 +1368,14 @@
       </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
-      <model usable='no' vendor='Intel'>n270</model>
+      <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>n270-v1</model>
+      <blockers model='n270-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>