cpu_map: Add kvm64-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 8077da260de2b977aa9889c3b2b22689539d6388..a9a8d1b2c4791f474bfff21b2ef27d4777bffac2 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -34,6 +34,7 @@
       <include filename='x86_qemu64.xml'/>
       <include filename='x86_qemu64-v1.xml'/>
       <include filename='x86_kvm64.xml'/>
+      <include filename='x86_kvm64-v1.xml'/>
     </group>
 
     <group name='Intel CPU models'>

diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 799a72df4747053db9d700e67b379885c13fd013..7ea53373ae01669b7a90faf0a7e613d16427b6c9 100644 (file)
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -101,6 +101,7 @@ cpumap_data = [
   'x86_KnightsMill.xml',
   'x86_kvm32-v1.xml',
   'x86_kvm32.xml',
+  'x86_kvm64-v1.xml',
   'x86_kvm64.xml',
   'x86_n270-v1.xml',
   'x86_n270.xml',

diff --git a/src/cpu_map/x86_kvm64-v1.xml b/src/cpu_map/x86_kvm64-v1.xml
new file mode 100644 (file)
index 0000000..73d1e4f
--- /dev/null
+++ b/src/cpu_map/x86_kvm64-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='kvm64-v1'>
+    <decode host='on' guest='off'/>
+    <model name='kvm64'/>
+  </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 e6c0863d546084b2b1e695a8b60b7c2179612b49..985a00cf84d62172d5c5e49033e7525dcf44a065 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -797,7 +797,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 7f68ca79c70e409a3554cb2da411b6a12f412c77..74aa563566fee331fa6e55dde2be07dbde016d26 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1418,7 +1418,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 13aef737e2f0f25f843964ce07e1c4ba4058a3d9..4fdeaec41703fc777d895d5d183ef4a98f16ecf4 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -796,7 +796,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 734d1f3bb26ed60dc9e67072b95e5f16ffbfc95d..284d70c7cc9660bc2c6b838b71a40e49c8e3ebb0 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -819,7 +819,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 39f1aaf3f8698406db0be8a2c940c57e4dd1a9e9..07097ce25b5d8696d7605544dfbd9df40c194eb3 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1508,7 +1508,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index 3db605a87bce75af70b27232e8d75711a2a15129..1aefe0ea082fa9dd0d09aeaba6794e8db552f896 100644 (file)
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -818,7 +818,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 c77b05c257b34baa0d733ba7f53c80aa1079cbf6..2ffe8cb3545bbb388e65969303616c61f85317f4 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -920,7 +920,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 67b5a9f3d8230ff86ea8c0c4fcbcc9aa090b676c..2a084c64fe79357fce4bd7df33d756f36c34b49e 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1705,7 +1705,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index daafd910790609be426518b9e90595b619102a67..bda2e0ef6803742d601761c3b3580d8a1b3531eb 100644 (file)
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -919,7 +919,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 6c15cae03dca270be104967e568a693334ef1fc9..d2fbcad98c9392f75e205e5f3a8f357b111b5d2a 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -926,7 +926,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 2480513c4bd39efcf022ffe4b9c9333e0fbc690f..60093eda9a0a7224f8de66e9af6d8ed7a93cb6e1 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1720,7 +1720,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 914f01107166a8bb15e7fdb9f5bfce425f36e72b..eafdc53ff69ea3cc5de4094bb40b108ee161494e 100644 (file)
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -925,7 +925,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 f368716de9f418d2507a440252ddc5003f966a9e..03896267d5726c3136bf3d99381a34c99a292473 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -953,7 +953,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 c3dba8ccd7186009f0f577d9a568dccf2987edb0..52eb4b821500616d77b3297f8fc97e40c2717e96 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1744,7 +1744,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index 4592e03dc4cc6e7ea5d08af27cb2c1a8d8926c06..f212097662f3df5c33b2a4208b026260814e47c8 100644 (file)
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -952,7 +952,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 39535a73ad744e2b7b42a2f9066fdfb797a7700d..38b0f470929c24ee2e8241f49b12cc7c3c7ae0ac 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -920,7 +920,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 0694b5426e03305f518d1acc238f2f0f893ab1ae..43de9e51936244e727d9a5e8e7b4e684be509e83 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1692,7 +1692,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index c36ebcf7fd0077855d063e42a32692e6a8b8099c..92514055c9d76d2310ecda1ea74d1783db9a91e5 100644 (file)
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -919,7 +919,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 3d15c7dca5c5eec334743f523d3067febd334c6a..10017064b8b2d1257cf1910b7379ea28b0dffbcc 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -925,7 +925,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 bfb94bc389f01d6b86fa267a6455e510cc5d514f..95b582af9f14537401e6d399a9bcf671bf589519 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
@@ -1405,7 +1405,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</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 bfb94bc389f01d6b86fa267a6455e510cc5d514f..95b582af9f14537401e6d399a9bcf671bf589519 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1405,7 +1405,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
index 2c3bca4a76aed00eb8d816404c820271efd11053..1e40bc5b23785a372079bb1b28723909cb265b8a 100644 (file)
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -924,7 +924,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 bf2c489691325c0a87920cb51f279f39d1409849..392ec1e2324a18aa899cdfefb9d1a28c52677250 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -1007,7 +1007,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 345f8177f22ce9d658111d4b8029ca91671dfa38..08932772502fd16c2e337545f64ee01c88a3a323 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1500,7 +1500,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
index 758ce18d386ae3ea51669eeba3cd8cdd59da7f7f..52ef9718d05209610fb1837beab2b9faea498d45 100644 (file)
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -1006,7 +1006,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 4a478b678f8f1777d02c9a2d9c4297d1faf05f88..ef74bbd2fa4f3188976371b1ee70fd2734f650a3 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -1236,7 +1236,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 e3dda5ff74d902ddf3030c3e89f616d2c7f104d0..404237ef671a725c93e26f5bbc6c51c6fbb00bcc 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1486,7 +1486,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
index aa94c9749939fe6a6321ceff54aedeb08a2ce4d8..eafacf0b61fb6c5005c70113a7de0951c4fb5f4b 100644 (file)
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -1235,7 +1235,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 f3ad13ff40236a3d4d0a8ee50d28aecd6e7e366c..c544eb02e3ed3f30d6da61b95fb7ce7a0f3e3788 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -1237,7 +1237,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 4aa6ddca4fd9fef863969e20501c80bb6a60e42f..b7b0ddd7c4cf56d5c0c13b4929946c78741633b2 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1453,7 +1453,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
index 8ad3499c674d63588a80b11f0c50536be77d9cbd..a4c86941c6ae7815f92fed9dc8504eb1c36fed75 100644 (file)
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -1236,7 +1236,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 b3325f4e36bd4b1b45e062225b74b58430a85ce8..06341f125af9e0635d8d7845d8b0690bb6a5d40e 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -1237,7 +1237,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 90a785ed55a3f6ba3a86d1e90372db9fd20b2b13..e759a15ea77aabc476ec15fafd35c837aedd8734 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -1383,7 +1383,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
index 9bac49c55395119aaa4dec5ffb5d7a19fb41606a..eb4822c667844524615ffc9e895bb5f04bb542d4 100644 (file)
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -1236,7 +1236,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 986c3936c0bd3119b3606b9de214cc5a9aeadb05..a6c7d8e74cff72024bef50b972014d019d76ace0 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -1373,7 +1373,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 9f4d2d8af85f8ea75596a3d213d67f7c4dcfb96c..18070cd01a92e7403fc06c7013232e5afbb8e266 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1488,7 +1488,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
index e8b70c7e0fcc016725805f9f1a4d7c889bb53a95..e008a2f2e9e0703789375fa05c980ff18f8b5fc5 100644 (file)
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -1372,7 +1372,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 4ac90bad0db2e14178fbd7da869dc4de983e6514..ce19774d0d356c4119c7387f0b7b87a83e46c065 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -1373,7 +1373,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>

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 94d866a5f027a0efd88040584befcf9cc8ec6998..217fbfe51c8806ae90b416847d23fa01471a960f 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1488,7 +1488,8 @@
       <model usable='yes' vendor='Intel'>coreduo-v1</model>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='yes' vendor='Intel' canonical='n270-v1'>n270</model>
       <model usable='yes' vendor='Intel'>n270-v1</model>
       <model usable='yes' vendor='unknown' canonical='pentium-v1'>pentium</model>

diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
index 84303bee0b144976d633905598cbe24f4d500e97..4f34340651f2eaabe63098bc7f221e1c83315fad 100644 (file)
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -1372,7 +1372,8 @@
       </blockers>
       <model usable='yes' vendor='unknown' canonical='kvm32-v1'>kvm32</model>
       <model usable='yes' vendor='unknown'>kvm32-v1</model>
-      <model usable='yes' vendor='unknown'>kvm64</model>
+      <model usable='yes' vendor='unknown' canonical='kvm64-v1'>kvm64</model>
+      <model usable='yes' vendor='unknown'>kvm64-v1</model>
       <model usable='no' vendor='Intel' canonical='n270-v1'>n270</model>
       <blockers model='n270'>
         <feature name='ss'/>