cpu_map: Add pentium2-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 a12c32eec6226ccdb9a905173ec2b498b1ee0ed0..1f1536339ca55214a0b36324918c8f4219a1effa 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -12,6 +12,7 @@
       <include filename='x86_pentium.xml'/>
       <include filename='x86_pentium-v1.xml'/>
       <include filename='x86_pentium2.xml'/>
+      <include filename='x86_pentium2-v1.xml'/>
       <include filename='x86_pentium3.xml'/>
       <include filename='x86_pentiumpro.xml'/>
       <include filename='x86_coreduo.xml'/>

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 2c76b32280cf4bae170656a8d0ada293a180bc30..47c22db5b78a417c7635f007010b89f8ba75484a 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -112,6 +112,7 @@ cpumap_data = [
   'x86_Penryn.xml',
   'x86_pentium-v1.xml',
   'x86_pentium.xml',
+  'x86_pentium2-v1.xml',
   'x86_pentium2.xml',
   'x86_pentium3.xml',
   'x86_pentiumpro.xml',

diff --git a/src/cpu_map/x86_pentium2-v1.xml b/src/cpu_map/x86_pentium2-v1.xml
new file mode 100644 (file)
index 0000000..554aebc
--- /dev/null
+++ b/src/cpu_map/x86_pentium2-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='pentium2-v1'>
+    <decode host='on' guest='off'/>
+    <model name='pentium2'/>
+  </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 783df2e45fa8ff0fdcb6ec9896492e17c3268438..db91ece84007129362c7a1aa50588a14119cf2e7 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 b0c660dda24fe0ae8cb6333628f17559b4e10f39..17ad483a0cac6d6b850fdb8f8b6d0680f23df312 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1419,7 +1419,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index d600d744f4b42116149ee7e04992d83f09a1c4de..88b506eeacb9c0d53a2fc7cee738c79389588c57 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 5076c5f864bf775712b297dbb6496f97578370a6..ec626f9c82b698338764a0aa9e01dc47a2720ad2 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 d47632f95f89fa6afc6c58e7301a5ffe8785d71d..1f9f215a6357293bc4ad69d64cf158b0b8a0103f 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1509,7 +1509,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 1a5ba3ed86bc066f6912310eede4dfc64e6a9bb7..3551b228326b7f9e0cd694bef0bdb4a46f1aa288 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 6f444b15ecfd0a7a83707493f5c0a7f9fe7f5fa5..057b9a392a86137f25ac66afa1f07d59608ea51c 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 d1a8a432d3c4e5dbc59b60af6430d4655362ef4d..e6a74efc27146f0dc52209c3411491dccc558436 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1706,7 +1706,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 9c83624e2047e73da21a744c0f03284041d106f1..8583b09a196b862e6a2b8fd9ac3dc054cec6c518 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 b696860c36806fa930af55b885caf673ac90cc8d..5662860ea430f250fd5554209bfdc7aa0485545b 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 686d89e864062c54e8eed454bc0f9aaf0076215b..3ae800014b073ff3af964625a4edfe51e8a7125e 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1721,7 +1721,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index c1ed9f13e9cdf0927058fb53be3b5b56f85612fc..ac04083e6de694d8f9d510782300713f85d751a7 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 1a0860f81a0a167737c33a2327a946b7271ecf1b..4c884f438580c0364e22701b7ef4eba06458359e 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 b8f950e7f3fdd556a5262313e0aba893c813e9d8..6e308eb156628f6ee47dd86dff376f580a0d31bd 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1745,7 +1745,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 9b7046a713098386ef5d2a7ec7b797e13ea7b35f..347c13024b2e53006d15a665fd4fb45e7d73f64d 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 087c90344e0faa27fa6cb5901636ae71de3f35f0..9d11b5f6c322309712f42e83990aaec03cf0afab 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 521eae41cef5764acd3172f6a1795227c5098080..92d0d0d24f2f052e45aac55d134ac3dc6aae9fe3 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1693,7 +1693,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 5d6438d440dca25fde19ed46a5a02d25547adf0d..e3eb689de3175bac6eecd42e5c432aadf158aa91 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 b7175be7dc1f69c562f3d197bd5dacf22c081041..d9aaf6bd1078eddfd4416a2a700af09417eb5261 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 08534be348918cfa51fa57b9b8645ff6b58e32ec..1b4ee8ab7a5987d6ab2ad9ec94afacf70ade4de1 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
@@ -1406,7 +1406,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 08534be348918cfa51fa57b9b8645ff6b58e32ec..1b4ee8ab7a5987d6ab2ad9ec94afacf70ade4de1 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1406,7 +1406,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index f8b95431ac1f18b8c55a2de3dcf9b427732820d2..1bd4e45095bc261e92625046862805910a17743f 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 30cf441d892a24f27e652cdbcda7d52d5fd82e72..7b9d9528667e916f77c4f0647f818b4a7741ae7b 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 940f1338e94320b370bd97a17ef5be513957a04d..dd96957e797d0433849bd51588a78f94a7f1cf5c 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1501,7 +1501,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 7ba288f0b29e89e9e39cadda57cf3de48a1e65c4..876d2a37a89b84e191d8cf4ca48ed84c07f98e63 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 f5f6afb094578f8bcd73b5dfcb1a97cc43754188..269c399d8ca7330f9b7458bbaae3a981e7fc366f 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 3fabd84691b5cc31cb466e71bfa5d34769f24756..d0899b6bebc10ac65f6d8705443f67b619057746 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1487,7 +1487,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index b52d6d68d6d66eb553bf87e63b91abfbac68861a..647ba2ab7abd802414c2a7bb80e56f370d363574 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 b67425cd2032d065c68d1c90a56c9af286c6feac..a0b2a7c84b8cb58def2949c473cf6756fee3526c 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 69be0c7ffeeaafa42125eddc35049e22cd3b388e..4b9cf3e152cc792f4c254c2676803964a301d6fe 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1454,7 +1454,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 29e6285b17d4b02592139a87741548988309bdd6..df21513db30390aa1e634b7e88ed985813614286 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 c75666a7fd89dc56b8897557d56f7b7fcd406136..1c872e7f207f3f2df500337611bb98507e5c3e2e 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 de856ff33b944dda1a5fb58e07eafa6e428d06e1..439a82f4e263f89ae3a61fa7d8f47d4244970883 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -1384,7 +1384,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index b6d210838c2c02c795f8314c70eb414bc25ccd9c..16764a7d67bb61e475b9819bc5b027b5ee32890c 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 054b233cfc2b25801329b1c1a9201ba44a08039d..c45c2a88d539711fc95c7dde43aef15235a54ad0 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 d847b5668073832a266836c1fadfe77fb799ba34..2391821956dc8d3db749f7980f6e47c4c50be3d4 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1489,7 +1489,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 6a4918211c5a646bf04444eb1dbeb36e192916b8..1c23ac2b9deb2fbab28de61d010be748ceb0167c 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 fe8e7c6a8d2e0229f7cdb5759c33fdf3f75d2374..135546d930e0c9d7f32529b278ab3a5df6786db7 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

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 58ee6816e791abf77a444f8adc2553123ab0f8fc..2002feb3381e544fbf8f7fb008d2173f71c86bec 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1489,7 +1489,8 @@
       <model usable='yes' vendor='Intel'>n270</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>

diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 7aae7a2904586205c88e1b60014f0d171c098613..871af7f505e86bb8bb22c3f41a381377426c3627 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 usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>
       <model usable='yes' vendor='unknown'>pentium-v1</model>
-      <model usable='yes' vendor='unknown'>pentium2</model>
+      <model usable='yes' vendor='unknown' canonical='pentium2-v1'>pentium2</model>
+      <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown'>pentium3</model>
       <model usable='no' vendor='AMD'>phenom</model>
       <blockers model='phenom'>