cpu_map: Add Conroe-v1 CPU model

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

src/cpu_map/index.xml

@@ -39,6 +39,7 @@
 
     <group name='Intel CPU models'>
       <include filename='x86_Conroe.xml'/>
+      <include filename='x86_Conroe-v1.xml'/>
       <include filename='x86_Penryn.xml'/>
       <include filename='x86_Nehalem.xml'/>
       <include filename='x86_Nehalem-IBRS.xml'/>

src/cpu_map/meson.build

@@ -40,6 +40,7 @@ cpumap_data = [
   'x86_Cascadelake-Server-v4.xml',
   'x86_Cascadelake-Server-v5.xml',
   'x86_Cascadelake-Server.xml',
+  'x86_Conroe-v1.xml',
   'x86_Conroe.xml',
   'x86_Cooperlake-v1.xml',
   'x86_Cooperlake-v2.xml',

src/cpu_map/x86_Conroe-v1.xml

@@ -0,0 +1,6 @@
+<cpus>
+  <model name='Conroe-v1'>
+    <decode host='on' guest='off'/>
+    <model name='Conroe'/>
+  </model>
+</cpus>

tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml

@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Conroe</model>
+  <model>Conroe-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='15' stepping='11'/>
   <feature name='dtes64'/>

tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml

@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Conroe</model>
+  <model>Conroe-v1</model>
   <vendor>Intel</vendor>
   <signature family='6' model='15' stepping='6'/>
   <feature name='dtes64'/>

tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml

@@ -218,7 +218,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml

@@ -350,7 +350,8 @@
         <feature name='x2apic'/>
         <feature name='xsavec'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_5.2.0.x86_64.xml

@@ -217,7 +217,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml

@@ -218,7 +218,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml

@@ -351,7 +351,8 @@
         <feature name='x2apic'/>
         <feature name='xsavec'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_6.0.0.x86_64.xml

@@ -217,7 +217,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml

@@ -234,7 +234,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx-vnni'/>

tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml

@@ -379,7 +379,8 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_6.1.0.x86_64.xml

@@ -233,7 +233,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx-vnni'/>

tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml

@@ -234,7 +234,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml

@@ -381,7 +381,8 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_6.2.0.x86_64.xml

@@ -233,7 +233,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml

@@ -235,7 +235,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml

@@ -382,7 +382,8 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_7.0.0.x86_64.xml

@@ -234,7 +234,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml

@@ -236,7 +236,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml

@@ -382,7 +382,8 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_7.1.0.x86_64.xml

@@ -235,7 +235,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml

@@ -241,7 +241,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml

@@ -311,7 +311,8 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml

@@ -311,7 +311,8 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_7.2.0.x86_64.xml

@@ -240,7 +240,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml

@@ -241,7 +241,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml

@@ -315,7 +315,8 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_8.0.0.x86_64.xml

@@ -240,7 +240,8 @@
         <feature name='pku'/>
         <feature name='spec-ctrl'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml

@@ -244,7 +244,8 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml

@@ -266,7 +266,8 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='arch-capabilities'/>

tests/domaincapsdata/qemu_8.1.0.x86_64.xml

@@ -243,7 +243,8 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml

@@ -245,7 +245,8 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml

@@ -265,7 +265,8 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='arch-capabilities'/>

tests/domaincapsdata/qemu_8.2.0.x86_64.xml

@@ -244,7 +244,8 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml

@@ -245,7 +245,8 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml

@@ -252,7 +252,8 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='arch-capabilities'/>

tests/domaincapsdata/qemu_9.0.0.x86_64.xml

@@ -244,7 +244,8 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml

@@ -249,7 +249,8 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml

@@ -251,7 +251,8 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='arch-capabilities'/>

tests/domaincapsdata/qemu_9.1.0.x86_64.xml

@@ -248,7 +248,8 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml

@@ -249,7 +249,8 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>

tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml

@@ -251,7 +251,8 @@
         <feature name='xsavec'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='arch-capabilities'/>

tests/domaincapsdata/qemu_9.2.0.x86_64.xml

@@ -248,7 +248,8 @@
         <feature name='spec-ctrl'/>
         <feature name='xsaves'/>
       </blockers>
-      <model usable='yes' vendor='Intel'>Conroe</model>
+      <model usable='yes' vendor='Intel' canonical='Conroe-v1'>Conroe</model>
+      <model usable='yes' vendor='Intel'>Conroe-v1</model>
       <model usable='no' vendor='Intel' canonical='Cooperlake-v1'>Cooperlake</model>
       <blockers model='Cooperlake'>
         <feature name='avx512-bf16'/>