cpu_map: Add kvm32-v1 CPU model

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

src/cpu_map/index.xml

@@ -28,6 +28,7 @@
       <include filename='x86_qemu32.xml'/>
       <include filename='x86_qemu32-v1.xml'/>
       <include filename='x86_kvm32.xml'/>
+      <include filename='x86_kvm32-v1.xml'/>
       <include filename='x86_cpu64-rhel5.xml'/>
       <include filename='x86_cpu64-rhel6.xml'/>
       <include filename='x86_qemu64.xml'/>

src/cpu_map/meson.build

@@ -99,6 +99,7 @@ cpumap_data = [
   'x86_IvyBridge-v2.xml',
   'x86_IvyBridge.xml',
   'x86_KnightsMill.xml',
+  'x86_kvm32-v1.xml',
   'x86_kvm32.xml',
   'x86_kvm64.xml',
   'x86_n270-v1.xml',

src/cpu_map/x86_kvm32-v1.xml

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

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

@@ -795,7 +795,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1416,7 +1416,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_5.2.0.x86_64.xml

@@ -794,7 +794,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -817,7 +817,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1506,7 +1506,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_6.0.0.x86_64.xml

@@ -816,7 +816,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -918,7 +918,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1703,7 +1703,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_6.1.0.x86_64.xml

@@ -917,7 +917,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -924,7 +924,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1718,7 +1718,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_6.2.0.x86_64.xml

@@ -923,7 +923,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -951,7 +951,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1742,7 +1742,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_7.0.0.x86_64.xml

@@ -950,7 +950,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -918,7 +918,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1690,7 +1690,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_7.1.0.x86_64.xml

@@ -917,7 +917,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -923,7 +923,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1403,7 +1403,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

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

@@ -1403,7 +1403,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_7.2.0.x86_64.xml

@@ -922,7 +922,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1005,7 +1005,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1498,7 +1498,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_8.0.0.x86_64.xml

@@ -1004,7 +1004,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1234,7 +1234,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1484,7 +1484,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_8.1.0.x86_64.xml

@@ -1233,7 +1233,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1235,7 +1235,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1451,7 +1451,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_8.2.0.x86_64.xml

@@ -1234,7 +1234,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1235,7 +1235,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1381,7 +1381,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_9.0.0.x86_64.xml

@@ -1234,7 +1234,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1371,7 +1371,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1486,7 +1486,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_9.1.0.x86_64.xml

@@ -1370,7 +1370,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1371,7 +1371,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>

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

@@ -1486,7 +1486,8 @@
       <model usable='yes' vendor='Intel'>core2duo-v1</model>
       <model usable='yes' vendor='Intel' canonical='coreduo-v1'>coreduo</model>
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>

tests/domaincapsdata/qemu_9.2.0.x86_64.xml

@@ -1370,7 +1370,8 @@
       <blockers model='coreduo-v1'>
         <feature name='ss'/>
       </blockers>
-      <model usable='yes' vendor='unknown'>kvm32</model>
+      <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
+      <model usable='yes' vendor='unknown'>kvm32-v1</model>
       <model usable='yes' vendor='unknown'>kvm64</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>