cpu_map: Add core2duo-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 9534e5f308b110fdddc93d897c5bc5956ca4eb7b..eb847341da24e1995ba9bb50b9882f13eec11471 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -21,6 +21,7 @@
       <include filename='x86_n270.xml'/>
       <include filename='x86_n270-v1.xml'/>
       <include filename='x86_core2duo.xml'/>
+      <include filename='x86_core2duo-v1.xml'/>
     </group>
 
     <group name='Generic QEMU CPU models'>

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 5e85e24eb9e1398f3d658990270a3524868efc56..b179fb442ccbf32ea851c78f3a8af921c4b4afeb 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -44,6 +44,7 @@ cpumap_data = [
   'x86_Cooperlake-v1.xml',
   'x86_Cooperlake-v2.xml',
   'x86_Cooperlake.xml',
+  'x86_core2duo-v1.xml',
   'x86_core2duo.xml',
   'x86_coreduo-v1.xml',
   'x86_coreduo.xml',

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

diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
index a1a42d4b8395b9dc7b79a456bdb38f2c1e6af835..1bad0b11d39ff1cf712523278e395fd333782b0a 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>core2duo</model>
+  <model>core2duo-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='37' stepping='5'/>
   <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 1ba8a7eb1134e36ed627e11cd625602303937e07..d4853706b3dbd88c6c518c796e4d0bc1ce83c68a 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -779,10 +779,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 1abbfcc4bb3a8a2db571bef4ff9088f9e1a53da2..03c88241c8e700c3a110e22e676407c8f171b74e 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1412,7 +1412,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 3040deeb50cf8a64e2372625fdc4773e845fa1d4..75592e124eb2570dac150456815e4d8c3d940532 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -778,10 +778,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 cb59946b78b5ac55311f0cc24d6e0e704fb3deaf..de38e870102cbee8fb0e0cf59b43f136f5c15041 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -801,10 +801,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 e6165eab77545a3d6b85890d67f66c12715c61ed..29aa3f9adc98c3ba93761acce62dc9ce43aef1c5 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1502,7 +1502,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 5aae9a3fcaf32ce215ac95e1f893a5e87dc5eba9..6469251e4728f6a3ff160e7e675875cf8d2c31b1 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -800,10 +800,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 2898e56b413aabf0c771d4d09e2022bd413d8e54..3918fd510169c9c87ead628cf91d590189481579 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -902,10 +902,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 2b5baf0a02675b9afb55b529ec8ac0394cb1059c..5d5b18cfdf2401b0414e9441345781a25e19bc2e 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1699,7 +1699,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 0fd3e38ee6021b02b30fef5b0a301c20266b1ab4..98bcfec2bb38e02a2bde06bbde9c74e1d24c989d 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -901,10 +901,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 690959d35a755155b92cd5623fd7796cf65ffaa7..ed4a66a4caf9664fc4a07d0665e1b0b4635f9360 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -908,10 +908,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 6153d8a9ee95eab1100f3083761830ed1543d17c..a748c623bc73ef9078229f3e443e7398b514ebb0 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1714,7 +1714,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 15edc7e73d00e5949bf42a9aebc98545bf25e507..f9a0221e7b41d74711a4d92c022f2f09200df75a 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -907,10 +907,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 a1f68beb2a65a64ec788cb7afa0d30e35b825677..6b97ff8ba7266f814dd3835c1f0bfb229e474bd1 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -935,10 +935,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 9eda36d3c8b1d0c56577e61bfeba82671bf782b9..2e27e674f2219900371100a2d5f2baffb5d63b0d 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1738,7 +1738,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 249baa13429a6875ec9e5d33feb1ea0d2cfb5611..99d8cf95586b4f776060af3a9a309565a71d0aab 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -934,10 +934,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 b65196f979885f3347ec249036a52a5fb6f1ee61..e101305e83a8191275766f96f6f5a82eceb4464d 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -902,10 +902,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 84df14bc63eb235cb90a5d673e30749be4ed64a1..24f90ed830041d04b245177fcbabb3f18d333ac3 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1686,7 +1686,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 2e41f4a73aadff66491c89558852087e443069b9..0f993e376377f80c469306e0a2326ff99d0e015b 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -901,10 +901,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 ca8391756b69f02831bb3efc2d2ee9e152a70093..bfea565a00d369918f1f47b32fc1c580fe008596 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -907,10 +907,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 258212d852e7b5fee3e83d50a7d9c373915e5075..91fc6133e40c7570cc12cd8f18a3f3b6a2fde4eb 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
@@ -1399,7 +1399,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</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 258212d852e7b5fee3e83d50a7d9c373915e5075..91fc6133e40c7570cc12cd8f18a3f3b6a2fde4eb 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1399,7 +1399,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 819010acff75d6d31cc400c715609898452f25a3..1e8f10d17fc3cca5c362e2afcd22542b4ae80ca8 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -906,10 +906,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 68b11921533d7861d5420237c4010034398c60ae..8dfbc2b21ace61fea03a757c8907ee36e9196ae9 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -989,10 +989,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 ea0bc81beae2a72162a64fae2eb8f4b5ca809c32..6982dc80358f20dd63ea5719e2e3ae9914b3b7e6 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1494,7 +1494,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index bddb1413a1044e43b99084e8dcf19c49558ce18e..a739ec6b739056b9c55f42ac121885090d06fdb7 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -988,10 +988,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 7f1f4a2082c3f3617c71f37bb165e1bea2904129..4d6e8c8a7fc6a8bc36184a4760ba89bcd51b7d2c 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -1218,10 +1218,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 e2fc678bb6f0bd359884e3b03763a82642eebc1a..0009fb007d39e232c8928f57bb6463a91b8f389d 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1480,7 +1480,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 4b0aed148dbcd2a55cdde19a8dfe216c1da9cce4..74f9fe6dbe3b28af36a6776e7b528ee9bcb416d8 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -1217,10 +1217,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 ab371ea688a35185c8abc6c86f19cd9edf353c4f..d4d7a9e079134e4363ece5f598e14b1d0a3cc8a9 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -1219,10 +1219,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 a256fed6d7c82317854de5b2f7181d14cb04c6de..b948f325389d92e9c4ac7e4fd9210291ef20a6b2 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1447,7 +1447,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 3f952bb3792afdec07a234b1a83718053a07de3a..3e22f5e9b3d5dd7e91f796200b6b0b5916a136e6 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -1218,10 +1218,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 21358e340aa53711d8ddd4a5964e50f71128540c..7a30c27b83dcf5449aee3aa314735af6e44ce1a9 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -1219,10 +1219,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 d34524193a93b1c9dae4a45fd2e6e1f9ee460f41..ee71c658cb9127bb98f9320bba6893de2cf2c4e8 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -1377,7 +1377,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index 9bbb95c0cb2b0fe357975059e056c63186fd93f9..8509032a622b018959114c0a713ff8207c27752f 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -1218,10 +1218,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 c5cbe2d855c7a0d4487424f700184f974260e0a3..b43b607c39d232345a86f90b57e2d90d79833beb 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -1355,10 +1355,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 3ec8575cf4d1f8c2892e1aa90f79ed517a339459..b79140038cf6111ce1c59a4190a884db9d57a5c2 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1482,7 +1482,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 513f4486cb75c5ca706ae4c4556e33a649ec58da..509b5a6c334ed7489d57169f99d221daa379dc7a 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -1354,10 +1354,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 089ab497e07b4c869d4f6d9e5490066af455c7a4..9114ece7667b2db4269f6e20310640e9e2a09582 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -1355,10 +1355,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>

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 64e893116acd89be450178837a09c37024121b48..e2e40d7ca269fd55239160ed789801cfeac289f7 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1482,7 +1482,8 @@
         <feature name='spec-ctrl'/>
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
-      <model usable='yes' vendor='Intel'>core2duo</model>
+      <model usable='yes' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
+      <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown'>kvm32</model>

diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 6e4f518b235a53b14bc899ada5c7df882d5683e4..4a5a09c4881c08bf41aca705d975d0763b36f95e 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -1354,10 +1354,14 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='no' vendor='Intel'>core2duo</model>
+      <model usable='no' vendor='Intel' canonical='core2duo-v1'>core2duo</model>
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>core2duo-v1</model>
+      <blockers model='core2duo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>