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>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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>

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>

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'/>

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'/>

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>

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'/>

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'/>

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'/>

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'/>

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>

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'/>

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>

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'/>

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'/>

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>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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 \