cpu_map: Remove monitor feature from EPYC-Rome

The feature is filtered by KVM and never automatically enabled. So even
though QEMU definition of EPYC-Rome contains this feature, the guest
won't see it. Also domain capabilities will show it as disabled for KVM
domains. Thus the feature should not really be included in our
definition of EPYC-Rome.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/cpu_map/x86_EPYC-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml
index 99fc015fddec3b0c91f4fa6a1d0a9fa87c064109..e54d0a48d835e1edaaace5aec6da79d3074c1dc1 100644 (file)
--- a/src/cpu_map/x86_EPYC-Rome.xml
+++ b/src/cpu_map/x86_EPYC-Rome.xml
@@ -37,7 +37,6 @@
     <feature name='misalignsse'/>
     <feature name='mmx'/>
     <feature name='mmxext'/>
-    <feature name='monitor'/>
     <feature name='movbe'/>
     <feature name='msr'/>
     <feature name='mtrr'/>

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

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
index b6784f9ebac886fd94dc8ecfb8fd74cd1cb6680b..65eaeabdd019ccc17c3f2a328ea664af4aa1253c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
@@ -3,6 +3,7 @@
   <model>EPYC-Rome</model>
   <vendor>AMD</vendor>
   <feature name='ht'/>
+  <feature name='monitor'/>
   <feature name='osxsave'/>
   <feature name='cmt'/>
   <feature name='xsaves'/>

diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml
index 86466c05477ccd3e0a73d31112be144d53192b18..febfdfcf2bade197fe803274c215ae9b4acc02a4 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml
@@ -17,5 +17,4 @@
   <feature policy='require' name='skip-l1dfl-vmentry'/>
   <feature policy='require' name='mds-no'/>
   <feature policy='require' name='pschange-mc-no'/>
-  <feature policy='disable' name='monitor'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
index cb2caab6f57ba143d65e65fb47af40941878cf34..6d95b508b234c0900b57043cd46dacf6292516b8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
@@ -2,6 +2,7 @@
   <model fallback='forbid'>EPYC-Rome</model>
   <vendor>AMD</vendor>
   <feature policy='require' name='ht'/>
+  <feature policy='require' name='monitor'/>
   <feature policy='require' name='osxsave'/>
   <feature policy='require' name='cmt'/>
   <feature policy='require' name='xsaves'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
index b6784f9ebac886fd94dc8ecfb8fd74cd1cb6680b..65eaeabdd019ccc17c3f2a328ea664af4aa1253c 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
@@ -3,6 +3,7 @@
   <model>EPYC-Rome</model>
   <vendor>AMD</vendor>
   <feature name='ht'/>
+  <feature name='monitor'/>
   <feature name='osxsave'/>
   <feature name='cmt'/>
   <feature name='xsaves'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
index c6aa67b6d5d1748bfc9ed3427729379831d5c906..7629a1b4a8fba0fecf019656100ff2a3743a0bea 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
@@ -16,6 +16,5 @@
   <feature policy='require' name='skip-l1dfl-vmentry'/>
   <feature policy='require' name='mds-no'/>
   <feature policy='require' name='pschange-mc-no'/>
-  <feature policy='disable' name='monitor'/>
   <feature policy='disable' name='amd-stibp'/>
 </cpu>

diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
index 716adab95bd15657be28ef47093b3d30f7ddb273..ed2da1f5daa8435231f1b3e5f5d5ce2354943ad3 100644 (file)
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -54,7 +54,6 @@
       <feature policy='require' name='skip-l1dfl-vmentry'/>
       <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='disable' name='monitor'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index dbb828c36829a3ccf43402e83015666ea10c04c2..4379ec351d83f6bbe9c03d90d6ed2407d6561384 100644 (file)
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -53,7 +53,6 @@
       <feature policy='require' name='skip-l1dfl-vmentry'/>
       <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='disable' name='monitor'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes'>qemu64</model>

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 71b655dd10f694aac958350c25f530ff4531c7c9..7fa021fcbac0b2c3574f1cea2b5399fc35df59ce 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -54,7 +54,6 @@
       <feature policy='require' name='skip-l1dfl-vmentry'/>
       <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='disable' name='monitor'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes'>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 b28dc590c198cb79fd3778dbb4b4d464e96046d5..953c18a251ec984191e685e124462b3ee652c7ef 100644 (file)
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -53,7 +53,6 @@
       <feature policy='require' name='skip-l1dfl-vmentry'/>
       <feature policy='require' name='mds-no'/>
       <feature policy='require' name='pschange-mc-no'/>
-      <feature policy='disable' name='monitor'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes'>qemu64</model>