cpu_map: Drop 'monitor' from modern x86 CPU models

The feature is never enabled by default on KVM and QEMU dropped it from
the models long ago.

https://bugzilla.redhat.com/show_bug.cgi?id=1798004

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>

diff --git a/src/cpu_map/x86_Dhyana.xml b/src/cpu_map/x86_Dhyana.xml
index 689daf864990d11ca74fd0f0d480973062d7ac8a..cfde07f99fa4f5c4c579e79481246c1acc3c2f8c 100644 (file)
--- a/src/cpu_map/x86_Dhyana.xml
+++ b/src/cpu_map/x86_Dhyana.xml
@@ -33,7 +33,7 @@
     <feature name='misalignsse'/>
     <feature name='mmx'/>
     <feature name='mmxext'/>
-    <feature name='monitor'/>
+    <feature name='monitor' removed='yes'/>
     <feature name='movbe'/>
     <feature name='msr'/>
     <feature name='mtrr'/>

diff --git a/src/cpu_map/x86_EPYC-IBPB.xml b/src/cpu_map/x86_EPYC-IBPB.xml
index 983c5f44458c5685f9377e25e5954e5e28ce31f2..fc5aadf52e2cb9bf44fe296e84a55cfac16017c5 100644 (file)
--- a/src/cpu_map/x86_EPYC-IBPB.xml
+++ b/src/cpu_map/x86_EPYC-IBPB.xml
@@ -34,7 +34,7 @@
     <feature name='misalignsse'/>
     <feature name='mmx'/>
     <feature name='mmxext'/>
-    <feature name='monitor'/>
+    <feature name='monitor' removed='yes'/>
     <feature name='movbe'/>
     <feature name='msr'/>
     <feature name='mtrr'/>

diff --git a/src/cpu_map/x86_EPYC.xml b/src/cpu_map/x86_EPYC.xml
index 3ebba9f4ed9bfe7ca816a51bcd959348b24c4175..3b406de37acb5391defe7caeb834c7b6c01cb092 100644 (file)
--- a/src/cpu_map/x86_EPYC.xml
+++ b/src/cpu_map/x86_EPYC.xml
@@ -33,7 +33,7 @@
     <feature name='misalignsse'/>
     <feature name='mmx'/>
     <feature name='mmxext'/>
-    <feature name='monitor'/>
+    <feature name='monitor' removed='yes'/>
     <feature name='movbe'/>
     <feature name='msr'/>
     <feature name='mtrr'/>

diff --git a/src/cpu_map/x86_Opteron_G3.xml b/src/cpu_map/x86_Opteron_G3.xml
index dab59d4f8247e66af3d56ac270ebf9f8b16bcad6..cf00af8698c4e3d9cfa5ea00f59c3e74fa71598a 100644 (file)
--- a/src/cpu_map/x86_Opteron_G3.xml
+++ b/src/cpu_map/x86_Opteron_G3.xml
@@ -18,7 +18,7 @@
     <feature name='mce'/>
     <feature name='misalignsse'/>
     <feature name='mmx'/>
-    <feature name='monitor'/>
+    <feature name='monitor' removed='yes'/>
     <feature name='msr'/>
     <feature name='mtrr'/>
     <feature name='nx'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
index 00539133274a83cf6caf22ebcf269e6223498533..9d14213a0bd81f6534c0944822e5d1e21ef1e92c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
@@ -2,6 +2,7 @@
   <model fallback='forbid'>EPYC</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='ht'/>
+  <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='cmp_legacy'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
index 7acab0a99935c6fa7bb2d0b1299feae37aac1cb9..8c2c975fdd6b7d7f0d3e4711d3935fb5c95491eb 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
@@ -3,6 +3,7 @@
   <model>EPYC</model>
   <vendor>AMD</vendor>
   <feature name='ht'/>
+  <feature name='monitor'/>
   <feature name='osxsave'/>
   <feature name='xsaves'/>
   <feature name='cmp_legacy'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
index 9164987bbdc48d46a054ab2b3a164e21e45c8465..1fee2fa9f87e1b8f596f65fe85ad9ca1d7797a10 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
@@ -2,6 +2,7 @@
   <model fallback='forbid'>EPYC-IBPB</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='ht'/>
+  <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='cmp_legacy'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
index 2fa8861e44e8008b9134dd8c2f8c443c3ab80ed2..c3bbf78396be7929b55dbe5d7960d3592656c66e 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
@@ -3,6 +3,7 @@
   <model>EPYC-IBPB</model>
   <vendor>AMD</vendor>
   <feature name='ht'/>
+  <feature name='monitor'/>
   <feature name='osxsave'/>
   <feature name='xsaves'/>
   <feature name='cmp_legacy'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
index af1e7f2f32f78d83f36a640404de90cb8d99b961..45f27a9a1f2b54558975e9b1fd9de729626a6afd 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
@@ -8,7 +8,7 @@
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='nrip-save'/>
-  <feature policy='disable' name='monitor'/>
   <feature policy='disable' name='rdtscp'/>
   <feature policy='disable' name='svm'/>
+  <feature policy='disable' name='monitor'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
index 4450a40f6165d448a910bd58044a6b47294091a8..5af19749e78c1052c6f6fa6f89e3747f4e6781b2 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
@@ -8,6 +8,6 @@
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='nrip-save'/>
-  <feature policy='disable' name='monitor'/>
   <feature policy='disable' name='svm'/>
+  <feature policy='disable' name='monitor'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
index 08c574255e5b7ec98d2041f7ffce41a771748fe5..5df21521f681259e59b880113137a8fe31466b6d 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
@@ -2,6 +2,7 @@
   <model fallback='forbid'>Dhyana</model>
   <vendor>Hygon</vendor>
   <feature policy='require' name='ht'/>
+  <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='cmp_legacy'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
index f1cddb6a19f999983c0fdf806cf1f545df552309..76c3753505f0dd387a08d4111d271813dcc67238 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
@@ -3,6 +3,7 @@
   <model>Dhyana</model>
   <vendor>Hygon</vendor>
   <feature name='ht'/>
+  <feature name='monitor'/>
   <feature name='osxsave'/>
   <feature name='xsaves'/>
   <feature name='cmp_legacy'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml
index 0fdd934c0827e7e9108a4cd6f00dbc027e3c6988..0408d51c1082b279b611176108a9c32a21a32d95 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml
@@ -9,6 +9,6 @@
   <feature policy='require' name='virt-ssbd'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='nrip-save'/>
-  <feature policy='disable' name='monitor'/>
   <feature policy='disable' name='svm'/>
+  <feature policy='disable' name='monitor'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
index a52c4cd3035c095ee75bba92d3af9f56ff59391a..99c64205796609d7bcf3a32f1c5b1c94b1161776 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
@@ -3,6 +3,7 @@
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
   <feature policy='require' name='ht'/>
+  <feature policy='require' name='monitor'/>
   <feature policy='require' name='mmxext'/>
   <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='pdpe1gb'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
index 800b092f14595f96f5b18473054e7143646f4f03..ecd532167a3904b00e6abbeafeca6f0b1a90c2f4 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
@@ -4,6 +4,7 @@
   <vendor>AMD</vendor>
   <feature name='vme'/>
   <feature name='ht'/>
+  <feature name='monitor'/>
   <feature name='mmxext'/>
   <feature name='fxsr_opt'/>
   <feature name='pdpe1gb'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
index a52c4cd3035c095ee75bba92d3af9f56ff59391a..99c64205796609d7bcf3a32f1c5b1c94b1161776 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
@@ -3,6 +3,7 @@
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
   <feature policy='require' name='ht'/>
+  <feature policy='require' name='monitor'/>
   <feature policy='require' name='mmxext'/>
   <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='pdpe1gb'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
index 800b092f14595f96f5b18473054e7143646f4f03..ecd532167a3904b00e6abbeafeca6f0b1a90c2f4 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
@@ -4,6 +4,7 @@
   <vendor>AMD</vendor>
   <feature name='vme'/>
   <feature name='ht'/>
+  <feature name='monitor'/>
   <feature name='mmxext'/>
   <feature name='fxsr_opt'/>
   <feature name='pdpe1gb'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
index d128553c1394e8c87d5165ce3d6979f11773ea23..d874bfc0499171edd46298280774fa3a8625640d 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
@@ -15,6 +15,6 @@
   <feature policy='require' name='3dnowprefetch'/>
   <feature policy='require' name='osvw'/>
   <feature policy='require' name='npt'/>
-  <feature policy='disable' name='monitor'/>
   <feature policy='disable' name='rdtscp'/>
+  <feature policy='disable' name='monitor'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
index ab0e99f97d3c1389d1192006c7c25e337343c670..f6106fdb1f02d9a0b4d3c755013b22036d1abc41 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
@@ -3,6 +3,7 @@
   <vendor>AMD</vendor>
   <feature policy='require' name='vme'/>
   <feature policy='require' name='ht'/>
+  <feature policy='require' name='monitor'/>
   <feature policy='require' name='mmxext'/>
   <feature policy='require' name='fxsr_opt'/>
   <feature policy='require' name='pdpe1gb'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
index d1617099813f11326bd02ccdc4a3b786b2cfe3f0..b4198f66a596de6641b85f5aa6ac173f37c5a9ba 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
@@ -15,8 +15,8 @@
   <feature policy='require' name='osvw'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='nrip-save'/>
-  <feature policy='disable' name='monitor'/>
   <feature policy='disable' name='nx'/>
   <feature policy='disable' name='rdtscp'/>
   <feature policy='disable' name='svm'/>
+  <feature policy='disable' name='monitor'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
index 00539133274a83cf6caf22ebcf269e6223498533..9d14213a0bd81f6534c0944822e5d1e21ef1e92c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
@@ -2,6 +2,7 @@
   <model fallback='forbid'>EPYC</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='ht'/>
+  <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='xsaves'/>
   <feature policy='require' name='cmp_legacy'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
index 7acab0a99935c6fa7bb2d0b1299feae37aac1cb9..8c2c975fdd6b7d7f0d3e4711d3935fb5c95491eb 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
@@ -3,6 +3,7 @@
   <model>EPYC</model>
   <vendor>AMD</vendor>
   <feature name='ht'/>
+  <feature name='monitor'/>
   <feature name='osxsave'/>
   <feature name='xsaves'/>
   <feature name='cmp_legacy'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
index aecc335c1e5c945efc68e00686409cf39044ac9e..9b9af2a6f7df4f50759cca45e2bcc8d0019fe508 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
@@ -8,6 +8,6 @@
   <feature policy='require' name='cmp_legacy'/>
   <feature policy='require' name='npt'/>
   <feature policy='require' name='nrip-save'/>
-  <feature policy='disable' name='monitor'/>
   <feature policy='disable' name='sha-ni'/>
+  <feature policy='disable' name='monitor'/>
 </cpu>

diff --git a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
index 00056c714146427166148019fd3bbcd020e192fb..3a6971584e17e3d9a2a99b67f7b57b23be2ef931 100644 (file)
--- a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
@@ -34,6 +34,7 @@
       <vendor>AMD</vendor>
       <feature policy='require' name='acpi'/>
       <feature policy='require' name='ss'/>
+      <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>

diff --git a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
index 4c867b18d019a5b632e40c62d34e7915afa8cc0c..049bc7e2e0a8c921f384867a365b4e15d004a0fc 100644 (file)
--- a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
@@ -34,6 +34,7 @@
       <vendor>AMD</vendor>
       <feature policy='require' name='acpi'/>
       <feature policy='require' name='ss'/>
+      <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>

diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
index 3a2fd5786a4c388b587e963e220c6ee8a9c960ff..1c650406c228ea38e5ab43fc2ebda8e0ad730f09 100644 (file)
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
@@ -34,6 +34,7 @@
       <vendor>AMD</vendor>
       <feature policy='require' name='acpi'/>
       <feature policy='require' name='ss'/>
+      <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>

diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
index e9e0cb9329a483ba37bf794aaa1a2cc83a47f4b7..a7fde52d649cdccdcb86f4dbc9a20ed85523f0a4 100644 (file)
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
@@ -34,6 +34,7 @@
       <vendor>AMD</vendor>
       <feature policy='require' name='acpi'/>
       <feature policy='require' name='ss'/>
+      <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>

diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
index 643cc4a631075663e73d89e252450146ede1211b..cc19a61316d6636c3eac1084e2fc60dbb4ed68b7 100644 (file)
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
@@ -34,6 +34,7 @@
       <vendor>AMD</vendor>
       <feature policy='require' name='acpi'/>
       <feature policy='require' name='ss'/>
+      <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>

diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
index bb1dacc14ceab48f7de09b136b533706843d269d..64bbef0a425fe0f1bb55086d3123fe1784eb2e4d 100644 (file)
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
@@ -34,6 +34,7 @@
       <vendor>AMD</vendor>
       <feature policy='require' name='acpi'/>
       <feature policy='require' name='ss'/>
+      <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>

diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index 622acc47a1f05c97cdf439adad3896f9915a9b0c..43d6d27e98a95361ca1dd90d8997c7d9bb6b45d9 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -34,6 +34,7 @@
       <vendor>AMD</vendor>
       <feature policy='require' name='acpi'/>
       <feature policy='require' name='ss'/>
+      <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>

diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
index 40d691a62d3b0b4cf96e5c78a28a5a65242fb42d..df562b53834a6843e969e2391cfdfd28eeb6ef9c 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -34,6 +34,7 @@
       <vendor>AMD</vendor>
       <feature policy='require' name='acpi'/>
       <feature policy='require' name='ss'/>
+      <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>

diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
index 21db6a084a1662afeadf1a1d843c86b829e0907f..0069c912dc1281407d57d05e246ef8abf500a309 100644 (file)
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -34,6 +34,7 @@
       <vendor>AMD</vendor>
       <feature policy='require' name='acpi'/>
       <feature policy='require' name='ss'/>
+      <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>

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 ad10e7b8fdd7b890cac907a1faa71efc15f99245..1b9f986a95336a9367b3c6f3fc20f5e44fc0d114 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -34,6 +34,7 @@
       <vendor>AMD</vendor>
       <feature policy='require' name='acpi'/>
       <feature policy='require' name='ss'/>
+      <feature policy='require' name='monitor'/>
       <feature policy='require' name='hypervisor'/>
       <feature policy='require' name='erms'/>
       <feature policy='require' name='mpx'/>

diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
index 6ee7bed18e865dc96ca2c819cf245491f786ad3e..017e7a6c060bc4365f03a60c0c4f87031e7776ef 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
@@ -13,9 +13,9 @@ QEMU_AUDIO_DRV=none \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
--cpu EPYC,acpi=on,ss=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,pku=on,\
-la57=on,3dnowext=on,3dnow=on,npt=on,vme=off,fma=off,avx=off,f16c=off,\
-rdrand=off,avx2=off,rdseed=off,sha-ni=off,xsavec=off,fxsr_opt=off,\
+-cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,\
+clwb=on,pku=on,la57=on,3dnowext=on,3dnow=on,npt=on,vme=off,fma=off,avx=off,\
+f16c=off,rdrand=off,avx2=off,rdseed=off,sha-ni=off,xsavec=off,fxsr_opt=off,\
 misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \
 -m 214 \
 -overcommit mem-lock=off \