cpu_map: Add qemu32-v1 CPU model

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

src/cpu_map/index.xml

@@ -26,6 +26,7 @@
 
     <group name='Generic QEMU CPU models'>
       <include filename='x86_qemu32.xml'/>
+      <include filename='x86_qemu32-v1.xml'/>
       <include filename='x86_kvm32.xml'/>
       <include filename='x86_cpu64-rhel5.xml'/>
       <include filename='x86_cpu64-rhel6.xml'/>

src/cpu_map/meson.build

@@ -121,6 +121,7 @@ cpumap_data = [
   'x86_pentium3.xml',
   'x86_pentiumpro.xml',
   'x86_phenom.xml',
+  'x86_qemu32-v1.xml',
   'x86_qemu32.xml',
   'x86_qemu64.xml',
   'x86_SandyBridge-IBRS.xml',

src/cpu_map/x86_qemu32-v1.xml

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

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

@@ -816,7 +816,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1430,7 +1430,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_5.2.0.x86_64.xml

@@ -815,7 +815,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -838,7 +838,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1520,7 +1520,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_6.0.0.x86_64.xml

@@ -837,7 +837,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -939,7 +939,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1717,7 +1717,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_6.1.0.x86_64.xml

@@ -938,7 +938,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -945,7 +945,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1732,7 +1732,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_6.2.0.x86_64.xml

@@ -944,7 +944,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -972,7 +972,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1756,7 +1756,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_7.0.0.x86_64.xml

@@ -971,7 +971,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -939,7 +939,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1704,7 +1704,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_7.1.0.x86_64.xml

@@ -938,7 +938,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -944,7 +944,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1417,7 +1417,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1417,7 +1417,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_7.2.0.x86_64.xml

@@ -943,7 +943,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1026,7 +1026,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1512,7 +1512,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_8.0.0.x86_64.xml

@@ -1025,7 +1025,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1255,7 +1255,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1498,7 +1498,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_8.1.0.x86_64.xml

@@ -1254,7 +1254,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1256,7 +1256,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1465,7 +1465,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_8.2.0.x86_64.xml

@@ -1255,7 +1255,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1256,7 +1256,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1395,7 +1395,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_9.0.0.x86_64.xml

@@ -1255,7 +1255,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1392,7 +1392,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1500,7 +1500,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_9.1.0.x86_64.xml

@@ -1391,7 +1391,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1392,7 +1392,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

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

@@ -1500,7 +1500,8 @@
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>

tests/domaincapsdata/qemu_9.2.0.x86_64.xml

@@ -1391,7 +1391,8 @@
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>qemu32</model>
+      <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
+      <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown'>qemu64</model>
     </mode>
   </cpu>