cpu_map: Add phenom-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 5f42fdc7fd1ff83bbb63b08f9bc36cf124281665..74b315c661a30371454aca5e5a151d23aba1a7f2 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -135,6 +135,7 @@
       <include filename='x86_athlon.xml'/>
       <include filename='x86_athlon-v1.xml'/>
       <include filename='x86_phenom.xml'/>
+      <include filename='x86_phenom-v1.xml'/>
       <include filename='x86_Opteron_G1.xml'/>
       <include filename='x86_Opteron_G2.xml'/>
       <include filename='x86_Opteron_G3.xml'/>

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 8d45feee0054f7c360d4e36d1dad145442ca6c4f..47c93deaceecf27fb27a333c5b80e2fd3b14df6b 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -126,6 +126,7 @@ cpumap_data = [
   'x86_pentium3-v1.xml',
   'x86_pentium3.xml',
   'x86_pentiumpro.xml',
+  'x86_phenom-v1.xml',
   'x86_phenom.xml',
   'x86_qemu32-v1.xml',
   'x86_qemu32.xml',

diff --git a/src/cpu_map/x86_phenom-v1.xml b/src/cpu_map/x86_phenom-v1.xml
new file mode 100644 (file)
index 0000000..f465c0e
--- /dev/null
+++ b/src/cpu_map/x86_phenom-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='phenom-v1'>
+    <decode host='on' guest='off'/>
+    <model name='phenom'/>
+  </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 c71286deb229a421cc52a671a06b5d4834129942..27d36feccfc91b23d32ec0e1218fc9fc623637f9 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -832,11 +832,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 26f3eed92bbf0b9a0fd6a3e145662fe4e3a64c74..b06febb82139203af4f0b43954dd508e619d3520 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1449,10 +1449,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 6e67479e2516a78c3127331edc6e3f157fe16ca9..21b4ab8c5ce70e5b4a0fd682fe895191d648109e 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -831,11 +831,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 d5b703e09a8da1c249e664725dcef3cf32ed9560..83bb914c7dd0b0af25bd1d570692a3330bff667a 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -854,11 +854,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 5928a72da9c92ae05b15f7fc0258c0c9dec4ad8d..47ab7240fbe68ab0834387d14c05fc32cd241a6e 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1539,10 +1539,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 69c1eb816f895d536e7664bea48128bcc0d5ea7d..cc212722f5d5779d35134ba52d798a31d51e15c7 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -853,11 +853,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 c65db67a414b5c5add0413e359bc8d2fd627eea8..ec7abc3903fe49f9548e43adf2092505b5b66aeb 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -955,11 +955,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 e85937b36de9914a6c3eabf683c6e1d18a0bcccb..87fe22edd79eb7b30987bb722361af1af2edfd01 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1736,10 +1736,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index b1b76ad6fd652120c4917b8676d773d6bd5b9c19..35bba8403332eb47148da61fe1ceb321dd682577 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -954,11 +954,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 fa27ff520accdbd7f2dc6d6d6a59a0c246eda4d2..b448d7bdb81b20f5c79d5f465c83d6c5101a8bbe 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -961,11 +961,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 33ff6301263f02836def174a3c215b12bef67a51..a8a96f2bb4ef61066a111b7ba1ed6610a4b9d9cf 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1751,10 +1751,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 0cf8733f1ee244dc1baa7fb86f522e5285a15ebb..303b714aa7a326d80e9ca88d7c5a12bb79aaf09b 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -960,11 +960,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 ba3669f4b28979048d6d28746091ee0339d1507a..9da8e156e2508528fc7a21362e9f62750e5c62df 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -988,11 +988,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 43b6a68e2485ff0a691f20d4f5b43ed04fd44b16..a5b9edaeb63984496e38a63ac85202baddaaa59e 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1775,10 +1775,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index a7d454b3302d7667da4de489f1109f90c99c2f69..3029403bac04891813733da14fe2a073b04ff6df 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -987,11 +987,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 08c27dbab8e6e520af0756196adc7f13e4182309..259613d7fed735f8f70e70190be6b41cf018e0b5 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -955,11 +955,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 8e974ebfde00657091f50bf2f2305cc4e184a499..d3ecad143cd1553d95fd04b89f7c97a2cf53ee0c 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1723,10 +1723,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 71cb90d17260ede244f7256b439f712cffeb4b7a..7f08dd995d4f9804bd91d114a8fcb9b04a44bca7 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -954,11 +954,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 2d346b5a15fb2a28071fb029ae323d830cdf00c5..1057fc58d384c4538f09f73e1a48592aad0d8123 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -960,11 +960,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 31a774af8a75714c3915316b0c67971d7fc0f4e1..fa4e9cfb8cb47ae13e322d729a5afcdc63bb39b8 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
@@ -1432,10 +1432,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</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 31a774af8a75714c3915316b0c67971d7fc0f4e1..fa4e9cfb8cb47ae13e322d729a5afcdc63bb39b8 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1432,10 +1432,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 46b0e223c72c7a1056f3557007767cb16451c52d..0c0f363d2bb3b299d37caad96bb29659b4450a3a 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -959,11 +959,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 95d809d41200ca846b4a7ff1bfa8802169cdc47d..b1de96faddfeb224e55fea75f920785ef0b7a0a6 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -1042,11 +1042,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 95c413a22fbdb54a23e263dba672f8544e23e30a..c83819435d111db73dfa2048efbd60229d1db6ab 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1527,10 +1527,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 4cd5d8e64034d969acf62b40850a6a913e188dc6..8f195f0e3942e3de36242f627a44fb60bad61723 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -1041,11 +1041,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 94def0594275eeb597eb086c48fff7b7b553af3d..5495883fe955ef4830387f6b5c055a4e1f3af538 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -1271,11 +1271,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 958b250336d0bd2b082dfde97c5fbd317c529b6c..87fc57da661c2695211e45a0af41f6f9a6a15efd 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1511,10 +1511,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index 4480ff39cd830cdffaa8a16cc4ce7fb9f47c0731..43703fefab2c66889ab00962219a0adf3e4adfe2 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -1270,11 +1270,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 9f91f9ef932164bfe3af08ff0f6ff3798f0302cb..2eab4e49b13e4515b310a1e8577b07ea74d8704c 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -1272,11 +1272,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 cf6ce118214f7b225f5a8d0d30aaf3310e5e46b1..08b45ba90b2255d5ef1acd1962587dfb8339dd31 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1478,10 +1478,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 07034ee9a72e4da9a619b208ed3d1a2c4d072e34..28b233d35d7a6d152351369c5dfc9c219318ba5d 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -1271,11 +1271,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 020ad5bdba0552e9b9bf9e3fc80327e75fe0ae0f..16a3cdacb5180f917919c6cd02326db468ccb687 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -1272,11 +1272,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 b0a25f5ea6f50153af36252afda27f430461f947..549e21c27327cc72c9087441b9bca880850ebc16 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -1407,10 +1407,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index f6e47f704ae67e23521b988fd7bc41cc39f81e6c..16e0d61c5116e7a41a2ba9f78826e030d834e06a 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -1271,11 +1271,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 b501544f11f40c5c80cd4a5bcef090e00da28689..2b33304882f0febbac79f48d6ca23cc4d20f5c3b 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -1408,11 +1408,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 1704b3b26559675e6337bfe3c62412757ed0de8b..f91fcdd4e5e519ddc0ee880b8f5e98348f922412 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1512,10 +1512,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index 3a1642af9445926f7b7792a6f02f0f729ca1986a..82fe2b3b1a25a1b8c40ad25ac3a388b76ce27588 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -1407,11 +1407,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 91eab3503911cb06aa914493a113bbf46e4cefe4..0c896766cb00b809a790d3f48ec4a99e2cce1bea 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -1408,11 +1408,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

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 e807b965f6ed420c86d7c20f9672a504f1752344..94c691476735c2ecc6b12d3417ff860ee5691cbc 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1512,10 +1512,14 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='fxsr_opt'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='fxsr_opt'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index a876e7b98f953c81c87a8dc2f4b5f1ad3c5dc1e3..1f73e3903ce3ba9cf667f5bba533d797b5ca0bb8 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -1407,11 +1407,16 @@
       <model usable='yes' vendor='unknown'>pentium2-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium3-v1'>pentium3</model>
       <model usable='yes' vendor='unknown'>pentium3-v1</model>
-      <model usable='no' vendor='AMD'>phenom</model>
+      <model usable='no' vendor='AMD' canonical='phenom-v1'>phenom</model>
       <blockers model='phenom'>
         <feature name='3dnow'/>
         <feature name='3dnowext'/>
       </blockers>
+      <model usable='no' vendor='AMD'>phenom-v1</model>
+      <blockers model='phenom-v1'>
+        <feature name='3dnow'/>
+        <feature name='3dnowext'/>
+      </blockers>
       <model usable='yes' vendor='unknown' canonical='qemu32-v1'>qemu32</model>
       <model usable='yes' vendor='unknown'>qemu32-v1</model>
       <model usable='yes' vendor='unknown' canonical='qemu64-v1'>qemu64</model>