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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 91fc6133e40c7570cc12cd8f18a3f3b6a2fde4eb..90908a78e2c8baff64641a74cff05ca3170bb2f9 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
@@ -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>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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