cpu_map: Add kvm32-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 0fe2a513ca9c6caad676e82da9dbcbe5c6f7a8c4..81d77e4dba2e944be2abeb0f8051aad83faaf951 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/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'/>

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 61c5e403f9a30c5a36eaa8a5634014894a34ea1c..d73a1b4feb5e6a630dd21d7fd2611f89a774d66f 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/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',

diff --git a/src/cpu_map/x86_kvm32-v1.xml b/src/cpu_map/x86_kvm32-v1.xml
new file mode 100644 (file)
index 0000000..cce4b1d
--- /dev/null
+++ b/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>

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 90a947b72ac294057c5c12de049e16849371c26d..da05a9358f5aa62fc8b5328179addf769bfce8ba 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/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'>

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 a1d2982897eb88d4a97cc2d62e05e50e39588542..296f4bce128e5f4aefb2c38d6613c932274c97bf 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 1c6e65a408db2040b608c215e4c869f343fa9a8f..dd5df8de0d8a5a4fc46cc64504a0f8a5ec772f10 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/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'>

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 bafaee4dc55df0807e175eeb026855f50c9a1f6f..4330afb33a56de075644f2e4273a1cc41a844b33 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/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'>

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 bac7c98eea0f9b62251162d63f72c73665305c9b..873d4b7b1fb154cbeb94061825e210314863b8cf 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index fe78b42ab39218e7eaa6e30460932935b1548884..f1f8362f521624fa8bf17a20b49992660a5904e4 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/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'>

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 c4e6cfeb8446237f2437e13b2e3e1e5b0452368e..7e0ed073a27dc68c22343478b71bfefcaf24d4ab 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/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'>

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 3390d156e5d8f313025f7dcb295da211956ee495..b93e3ca9ac19c1d2f609dbc4a6a3ea90f25b10d0 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 62d5a4bdad0a6329f46e63d17c0e28f7c0c23ea2..8c538a6568a0896617d009f5c27fb6303e268c1c 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/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'>

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 77fa39cf139446c08f55d395ecd20dbd5e70b862..dc8fd0539b92700189c2ddeb244e43ee099ba155 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/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'>

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 ee366317172e1a4cbc2d8949f3aceed9817a37a4..e075cc7dca1db915dda03ab5b528d2dc08356612 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index fb66ff603218e9d5d1ece847566ad367afa87493..d0955a30f26ea1ce99210300ceee1027547ab505 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/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'>

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 fbbe1f7ed42857c0f2414819eebd844edb5e27bd..4f2d2a272dcbf1e0130d60e4b0c95d8506f6ffff 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/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'>

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 f5a84c16f7bae19be8f0fbbe603bf5b0a66a43bb..fcb175557cca822cc1836311d3b8a3adf34374e7 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index d8283190618330a0a0fc7727f704d5e811931ca7..07fa015c26600989c8c4896cfcf012284d272aad 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/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'>

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 968be6fc3193ab2f77dced6ad2a578fb03a3b5a2..7880718cafc962e49ba9e974490bade98ab7cd07 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/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'>

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 d0a03a641c8a9154e7b1fa6452db79e2a77fff13..e34444f91544483b94fb14264fe90d789523b5d5 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index a0492d152e713509e7c0c93f16a2049403978ca9..dd045555db054a464693328bd7e2bd018e83a851 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/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'>

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 dfb06177ffffeb647810dadee194a78af319da49..34527a0fc0226b644291ebe49632f569ee0bb0a1 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/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'>

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 90908a78e2c8baff64641a74cff05ca3170bb2f9..14f0bc7f87825578e7fe84f9664d1fe592a0d39e 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
@@ -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>

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 90908a78e2c8baff64641a74cff05ca3170bb2f9..14f0bc7f87825578e7fe84f9664d1fe592a0d39e 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index f3c03fe68ba136ebaf6a397754e9f7c56fcbbdcf..de7e039b8437426f0fbb8d687dd2924d7848427a 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/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'>

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 27e43a875e169a76b6dc44be7cc41bf81fba0abd..eeee7b926ca7b036b6dc9b3d5d74b966b260cc39 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/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'>

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 8fc17e9d8a23d41dab993d5e4be7fe6a57b026a6..882ef3ed4d2da25481421eba65f19796aee62439 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index ccaf3af991d9b7b2758e70d8c77f44d971309d48..dee27a40c49d23af9329dc0bbe694fa145413799 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/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'>

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 f77e36d1eaea0106e182abd12330ca2cce53e468..14f9d0a3a5ecf1e51e65780b428fcf3f2de4dee9 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/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'>

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 5e5cf92e53b24973855c7d684674abac1c9144e2..1347de2c5ba1e5e081381a2b0863d3489cf0b9ce 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 3b53baae7aca3b42dcc3819160998ad66e581a8d..6855f75ba4754c12dc0ac356e598397db55e862f 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/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'>

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 a4faf9112ce95c1abf872afef0c451118c475cde..63bce83ba56d5e1b99adbf3186b099eea957c53d 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/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'>

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 3e7ba22317bbfc4476e16d9fd217c56841ceaf9f..6b4db430772a31089b221f7aeebabccc718b2969 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index a2fbea3b21b3076c73cb992c011fa22cae74c6ed..b9449120d338593d0ea5953aceb49244c4b9a874 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/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'>

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 b945327d7addecc35e7c069f7f0a14a0190b46a4..5b0f2f84be7dc236fd2ad15ec8af061081dc5f82 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/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'>

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 1c00bbb89961ae6ea79832a701219fe152886644..04049d17afb29fecd0e9df0b94a2715751d2a04f 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index c0d45ff56b6a892bb803704d5548e9531cf881b5..4ec2b2e96df0a9ba55cc2a6016e8dfb278358e35 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/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'>

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 7d5c0b114d784c862164dbdd6bffaa82ab7c200d..9e152d5b55c9493221a1c6927d352fb52fcba61d 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/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'>

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 915970f0cae7509899b32350db30e4e685beaf65..1c79f73ae2be48ebe700c88f051d6c6dcc3d5d6b 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 3703b8b6f4ab64d3bcef0639a3fecb7d31914160..0af8a79cb45d1a51e3a7d723b7cd50623fd98672 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/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'>

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 c76d4d112f1eb81cfdd156ba3a239835e9230b2e..4cb0a22a9b9eb14914ed093989d224b5bbe5eab6 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/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'>

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 cf9ef74abe4a01267b4ebf401c7d4a897b15150d..99858a0b912342b8f8a693b4493a3d8d4e0220d0 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/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>

diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index bb64a26754317116a2b807b1bf07d79eecef58ad..cfedba3e8e1587b9484f7ca680504cdf4d4ff43b 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/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'>