cpu_map: Add coreduo-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 87cc4f61ed9c1afdb33a20c5b692dafb3b3062ad..d8df3b214d5c9dbdc16cdb7bff9d11f6c47e21da 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -17,6 +17,7 @@
       <include filename='x86_pentium3-v1.xml'/>
       <include filename='x86_pentiumpro.xml'/>
       <include filename='x86_coreduo.xml'/>
+      <include filename='x86_coreduo-v1.xml'/>
       <include filename='x86_n270.xml'/>
       <include filename='x86_core2duo.xml'/>
     </group>

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 6645786736bac61601bac231f45afc4a4e011afd..1213f6929c5a8af06245d35a5bc3f5d3dd8f0fc9 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -45,6 +45,7 @@ cpumap_data = [
   'x86_Cooperlake-v2.xml',
   'x86_Cooperlake.xml',
   'x86_core2duo.xml',
+  'x86_coreduo-v1.xml',
   'x86_coreduo.xml',
   'x86_cpu64-rhel5.xml',
   'x86_cpu64-rhel6.xml',

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

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 f887be446871380cf923f90c70a928d8793ba449..cb6db8f83c01aa401dbf0eae8f412a821fea2b8b 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -783,10 +783,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 0c5a3a81f8e16829b95318a809ecc6d79c13060f..36625a07b3f79a427c4c8c80adf4bcfeb956bec7 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1413,7 +1413,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 7591b2efe93287dcc280eeb6ae9ee5236e800c3e..fcd76f9bc8d994eb8abce7d203c050141d5d4e39 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -782,10 +782,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 a7b325fd617648d5d63e6ecb0096237aa5d7ab07..4b2d94b281370cd681d9a43cc0a178d2b3298be8 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -805,10 +805,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 63c1ff9b4acdfcce1fd21b4daf27d9ce2a68996d..b20dbe72c1917914546ab260be51b691fa053133 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1503,7 +1503,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 3d6ff5657efdbba19a6fcdf8eebabb5b4b37e2e8..ad3be2108544e465a54bb3978ed07479bc0def6b 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -804,10 +804,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 e475c264ee3c4695a1a26bf21f3052d8d4bab833..a76f03f9101a830052dcc762b6f24141aa1ab17a 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -906,10 +906,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 5deb101fe33dcfdecd6c437169b09ab00524e988..da44554a73ef14441e11152aebf87eed42fe71aa 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1700,7 +1700,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index f4542588e81abb3a14ea6240c464bfcb3c8cf400..4369595b2e6ec7b30a3ea48504e87d21a5a9bb6d 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -905,10 +905,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 c388b7919a36212012d7531781b6e240a5857c5a..dc6dd2f7433174fb60b05b9d77aabde1c83bb653 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -912,10 +912,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 bae374c05bdcbdcb31b6954c28e3e277ad796957..d8bb03fbfdf4776dd0740b11a675e9e7c0212c3d 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1715,7 +1715,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 43d1a8d3a2fb74177af620521110b3fb2b6b116f..69afbc55f0eeaf36af70d08c1c9f65372d583ba2 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -911,10 +911,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 b882feace04bec22db760e9ed9e12676b81a87cb..0798ee74dec0f7710d4d8228c09abe5307081fae 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -939,10 +939,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 dcdad93bc445139d4b199542ec45ba8f93b7e8af..07bbd505fab4cc66d8e6d682e0519ab91ab1aa60 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1739,7 +1739,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index f825365d4e1d1d18495e62d3f408b82e698b53fe..bf07fa3f5108469d29884b7de89dcc116f309cdc 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -938,10 +938,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 f8ac31d143b760d02e7f15e5aa9083f7b16523ee..694561221fffb210c5009efe34d6a7cd8f8f473b 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -906,10 +906,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 c4a159a3dad6208a13c783b9263de284dbf695d2..d98b89594037cec3e3dc5a26ea3559b4667b7af0 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1687,7 +1687,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 5efd8d499fb7bbff817fc919115a7b812f062e93..e02f39bdf5cc8cff2308ac3180f60f3309b9ebdb 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -905,10 +905,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 a0f10ca42d193c84ed1aa038deafeb552c36d662..faa838ee4baa7f3f098834a756bc892dce311d82 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -911,10 +911,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 26e716e0e8b94c61ce9023c633a8ae38fe54c52f..c65ffc40bbef4bd5ca04d79d190252db3f9af22e 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
@@ -1400,7 +1400,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</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 26e716e0e8b94c61ce9023c633a8ae38fe54c52f..c65ffc40bbef4bd5ca04d79d190252db3f9af22e 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1400,7 +1400,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 871949d74f5bb95891e0538b03d32af47d24e790..0a88511093ca46683050e3659cec2e4f2e324b83 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -910,10 +910,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 9fb5e0a823c89a5a5244d8871c5197b1f42b731b..e931d7445d679550f9b28c1837cd19e16eb3e7b3 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -993,10 +993,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 d7aeb43b835a67629c78c1c569a8ca5f5f994d87..c0cc453fd12ac992a898b3f75bd166157878ae6d 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1495,7 +1495,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 8e226ee23702675416004406bd476a452658c0f5..59c36bfa49875d05024695c31b7dde5ae665d99f 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -992,10 +992,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 27fddae9f5e1224157c76f116990d7d98e6cfd82..f822c040de80f111b5b5cc099afa509d151e9713 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -1222,10 +1222,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 30169a55e41001cc82f65cbba4d80bc7fa557eb6..7ea876c1fc7f1723fd6350a70de66d402970f29e 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1481,7 +1481,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index c91b05f312a8df08583074f88bf33028b9243d3a..56a57665f18f49b654f105e375c9abb21b451fa4 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -1221,10 +1221,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 76d9f80936dd1b19ada1947d9e0ed75f7566adfb..d2e14fcaabee938a03440525b4a65499c7793fea 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -1223,10 +1223,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 7f08733452912b43d802a882d1da2bc4db694193..25fe5a3f489967289f578d191bc8f74c3e57efcb 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1448,7 +1448,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 4bf5988cf3bf9a124f04ced55ec7ae880821b930..dfcbcf2477640cff3b1aa46c6b80cc27e2da54a0 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -1222,10 +1222,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 8e2d2a636e0d718f6f19d7673c856dc3373389f5..7b20023b1913125efe2d48c1081e0f561a9fb99b 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -1223,10 +1223,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 0b488faa07150464866f3d14e8813b9d49c36a7a..ee58ddff1d57be181a9f54a2e34a8031a5cb88bc 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -1378,7 +1378,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index 9b41cc5fcce37b820ce95f35d26ba0601490b1d6..d2f19183f0170fd4ca2d32e8809df85c32d22fd2 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -1222,10 +1222,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 996a269525deb4db2e1399ee806fba3754f73ccb..3e3bd2b5e103519488cb38c1255f43bd96acd624 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -1359,10 +1359,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 5d914aa62ca61fc3a44772cdb6dfa993c7d9a509..f4e8163256dffcd67c54d5ef26a1863c80647170 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1483,7 +1483,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 094ec28df0058b6f4867ddafcd07301cbb76eab2..54d5323f713ea176cf64e24b7b91713475681cdb 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -1358,10 +1358,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 0e9a63cf4e0d5680032fad077ea50927e357a21f..b9697229d9e20f90cff3e12c74dd52cc8878b4c4 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -1359,10 +1359,14 @@
       <blockers model='core2duo'>
         <feature name='ss'/>
       </blockers>
-      <model usable='no' vendor='Intel'>coreduo</model>
+      <model usable='no' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <blockers model='coreduo'>
         <feature name='ss'/>
       </blockers>
+      <model usable='no' vendor='Intel'>coreduo-v1</model>
+      <blockers model='coreduo-v1'>
+        <feature name='ss'/>
+      </blockers>
       <model usable='yes' vendor='unknown'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel'>n270</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 9fb8cb4e4acffbf4e053007a7ad3ed39fba5d386..cc672be9a1ceaa24ddf4b5a2aa53837ccbdfcef8 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1483,7 +1483,8 @@
       </blockers>
       <model usable='yes' vendor='AMD'>athlon</model>
       <model usable='yes' vendor='Intel'>core2duo</model>
-      <model usable='yes' vendor='Intel'>coreduo</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>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel'>n270</model>

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