cpu_map: Add core2duo-v1 CPU model

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

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'>

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',

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>

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'/>

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'/>

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>

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'/>

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'/>

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>

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'/>

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'/>

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>

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'/>

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'/>

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>

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'/>

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'/>

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>

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'/>

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'/>

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>

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'/>

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'/>

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>

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>

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'/>

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'/>

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>

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'/>

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'/>

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>

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'/>

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'/>

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>

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'/>

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'/>

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>

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'/>

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'/>

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>

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'/>

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'/>

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>

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'/>