cpu_map: Add 486-v1 CPU model

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

src/cpu_map/index.xml

@@ -5,6 +5,7 @@
 
     <group name='generic'>
       <include filename='x86_486.xml'/>
+      <include filename='x86_486-v1.xml'/>
     </group>
 
     <group name='Intel-based QEMU generic CPU models'>

src/cpu_map/meson.build

@@ -22,6 +22,7 @@ cpumap_data = [
   'ppc64_POWERPC_e5500.xml',
   'ppc64_POWERPC_e6500.xml',
   'ppc64_vendors.xml',
+  'x86_486-v1.xml',
   'x86_486.xml',
   'x86_athlon.xml',
   'x86_Broadwell-IBRS.xml',

src/cpu_map/x86_486-v1.xml

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

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

@@ -62,7 +62,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -74,7 +74,8 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_5.2.0.x86_64.xml

@@ -61,7 +61,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -62,7 +62,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -75,7 +75,8 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_6.0.0.x86_64.xml

@@ -61,7 +61,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -63,7 +63,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -75,7 +75,8 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_6.1.0.x86_64.xml

@@ -62,7 +62,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -63,7 +63,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -77,7 +77,8 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_6.2.0.x86_64.xml

@@ -62,7 +62,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -64,7 +64,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -78,7 +78,8 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_7.0.0.x86_64.xml

@@ -63,7 +63,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -65,7 +65,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -78,7 +78,8 @@
       <feature policy='disable' name='misalignsse'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_7.1.0.x86_64.xml

@@ -64,7 +64,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -70,7 +70,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -67,7 +67,8 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='3dnowprefetch'/>

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

@@ -67,7 +67,8 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_7.2.0.x86_64.xml

@@ -69,7 +69,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -70,7 +70,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -71,7 +71,8 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='3dnowprefetch'/>

tests/domaincapsdata/qemu_8.0.0.x86_64.xml

@@ -69,7 +69,8 @@
       <feature policy='require' name='pschange-mc-no'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -72,7 +72,8 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -72,7 +72,8 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='hle'/>

tests/domaincapsdata/qemu_8.1.0.x86_64.xml

@@ -71,7 +71,8 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -73,7 +73,8 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -71,7 +71,8 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='hle'/>

tests/domaincapsdata/qemu_8.2.0.x86_64.xml

@@ -72,7 +72,8 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -73,7 +73,8 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -73,7 +73,8 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='hle'/>

tests/domaincapsdata/qemu_9.0.0.x86_64.xml

@@ -72,7 +72,8 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -77,7 +77,8 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -72,7 +72,8 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='hle'/>

tests/domaincapsdata/qemu_9.1.0.x86_64.xml

@@ -76,7 +76,8 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -77,7 +77,8 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>

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

@@ -72,7 +72,8 @@
       <feature policy='disable' name='nrip-save'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='hle'/>

tests/domaincapsdata/qemu_9.2.0.x86_64.xml

@@ -76,7 +76,8 @@
       <feature policy='disable' name='xsaves'/>
     </mode>
     <mode name='custom' supported='yes'>
-      <model usable='yes' vendor='unknown'>486</model>
+      <model usable='yes' vendor='unknown' canonical='486-v1'>486</model>
+      <model usable='yes' vendor='unknown'>486-v1</model>
       <model usable='no' vendor='Intel' canonical='Broadwell-v1'>Broadwell</model>
       <blockers model='Broadwell'>
         <feature name='erms'/>