cpu_map: Add missing vmx features from MSR 0x48F

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

src/cpu_map/x86_features.xml

@@ -1012,4 +1012,38 @@
   <feature name='vmx-secondary-ctls'>
     <msr index='0x48e' edx='0x00000000' eax='0x80000000'/>
   </feature>
+
+  <feature name='vmx-exit-nosave-debugctl'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00000004'/>
+  </feature>
+  <feature name='vmx-exit-load-perf-global-ctrl'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00001000'/>
+  </feature>
+  <feature name='vmx-exit-ack-intr'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00008000'/>
+  </feature>
+  <feature name='vmx-exit-save-pat'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00040000'/>
+  </feature>
+  <feature name='vmx-exit-load-pat'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00080000'/>
+  </feature>
+  <feature name='vmx-exit-save-efer'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00100000'/>
+  </feature>
+  <feature name='vmx-exit-load-efer'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00200000'/>
+  </feature>
+  <feature name='vmx-exit-save-preemption-timer'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00400000'/>
+  </feature>
+  <feature name='vmx-exit-clear-bndcfgs'>
+    <msr index='0x48f' edx='0x00000000' eax='0x00800000'/>
+  </feature>
+  <feature name='vmx-exit-clear-rtit-ctl'>
+    <msr index='0x48f' edx='0x00000000' eax='0x02000000'/>
+  </feature>
+  <feature name='vmx-exit-load-pkrs'>
+    <msr index='0x48f' edx='0x00000000' eax='0x20000000'/>
+  </feature>
 </cpus>

tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml

@@ -13,4 +13,5 @@
   <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
   <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
+  <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
 </cpudata>

tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml

@@ -76,6 +76,13 @@
   <feature policy='require' name='vmx-monitor-exit'/>
   <feature policy='require' name='vmx-pause-exit'/>
   <feature policy='require' name='vmx-secondary-ctls'/>
+  <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+  <feature policy='require' name='vmx-exit-ack-intr'/>
+  <feature policy='require' name='vmx-exit-save-pat'/>
+  <feature policy='require' name='vmx-exit-load-pat'/>
+  <feature policy='require' name='vmx-exit-save-efer'/>
+  <feature policy='require' name='vmx-exit-load-efer'/>
+  <feature policy='require' name='vmx-exit-save-preemption-timer'/>
   <feature policy='disable' name='mpx'/>
   <feature policy='disable' name='core-capability'/>
   <feature policy='disable' name='pdpe1gb'/>

tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml

@@ -14,4 +14,5 @@
   <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
   <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
+  <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
 </cpudata>

tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml

@@ -72,4 +72,11 @@
   <feature policy='require' name='vmx-monitor-exit'/>
   <feature policy='require' name='vmx-pause-exit'/>
   <feature policy='require' name='vmx-secondary-ctls'/>
+  <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+  <feature policy='require' name='vmx-exit-ack-intr'/>
+  <feature policy='require' name='vmx-exit-save-pat'/>
+  <feature policy='require' name='vmx-exit-load-pat'/>
+  <feature policy='require' name='vmx-exit-save-efer'/>
+  <feature policy='require' name='vmx-exit-load-efer'/>
+  <feature policy='require' name='vmx-exit-save-preemption-timer'/>
 </cpu>

tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml

@@ -12,4 +12,5 @@
   <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
   <msr index='0x48d' edx='0x00000000' eax='0x00000069'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
+  <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
 </cpudata>

tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml

@@ -71,6 +71,13 @@
   <feature policy='require' name='vmx-monitor-exit'/>
   <feature policy='require' name='vmx-pause-exit'/>
   <feature policy='require' name='vmx-secondary-ctls'/>
+  <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+  <feature policy='require' name='vmx-exit-ack-intr'/>
+  <feature policy='require' name='vmx-exit-save-pat'/>
+  <feature policy='require' name='vmx-exit-load-pat'/>
+  <feature policy='require' name='vmx-exit-save-efer'/>
+  <feature policy='require' name='vmx-exit-load-efer'/>
+  <feature policy='require' name='vmx-exit-save-preemption-timer'/>
   <feature policy='disable' name='hle'/>
   <feature policy='disable' name='rtm'/>
 </cpu>

tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml

@@ -13,4 +13,5 @@
   <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
   <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
+  <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>
 </cpudata>

tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml

@@ -78,4 +78,11 @@
   <feature policy='require' name='vmx-monitor-exit'/>
   <feature policy='require' name='vmx-pause-exit'/>
   <feature policy='require' name='vmx-secondary-ctls'/>
+  <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+  <feature policy='require' name='vmx-exit-ack-intr'/>
+  <feature policy='require' name='vmx-exit-save-pat'/>
+  <feature policy='require' name='vmx-exit-load-pat'/>
+  <feature policy='require' name='vmx-exit-save-efer'/>
+  <feature policy='require' name='vmx-exit-load-efer'/>
+  <feature policy='require' name='vmx-exit-save-preemption-timer'/>
 </cpu>

tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml

@@ -78,4 +78,11 @@
   <feature policy='require' name='vmx-monitor-exit'/>
   <feature policy='require' name='vmx-pause-exit'/>
   <feature policy='require' name='vmx-secondary-ctls'/>
+  <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+  <feature policy='require' name='vmx-exit-ack-intr'/>
+  <feature policy='require' name='vmx-exit-save-pat'/>
+  <feature policy='require' name='vmx-exit-load-pat'/>
+  <feature policy='require' name='vmx-exit-save-efer'/>
+  <feature policy='require' name='vmx-exit-load-efer'/>
+  <feature policy='require' name='vmx-exit-save-preemption-timer'/>
 </cpu>

tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml

@@ -115,6 +115,13 @@
       <feature policy='require' name='vmx-monitor-exit'/>
       <feature policy='require' name='vmx-pause-exit'/>
       <feature policy='require' name='vmx-secondary-ctls'/>
+      <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+      <feature policy='require' name='vmx-exit-ack-intr'/>
+      <feature policy='require' name='vmx-exit-save-pat'/>
+      <feature policy='require' name='vmx-exit-load-pat'/>
+      <feature policy='require' name='vmx-exit-save-efer'/>
+      <feature policy='require' name='vmx-exit-load-efer'/>
+      <feature policy='require' name='vmx-exit-save-preemption-timer'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>

tests/domaincapsdata/qemu_4.2.0.x86_64.xml

@@ -114,6 +114,13 @@
       <feature policy='require' name='vmx-monitor-exit'/>
       <feature policy='require' name='vmx-pause-exit'/>
       <feature policy='require' name='vmx-secondary-ctls'/>
+      <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+      <feature policy='require' name='vmx-exit-ack-intr'/>
+      <feature policy='require' name='vmx-exit-save-pat'/>
+      <feature policy='require' name='vmx-exit-load-pat'/>
+      <feature policy='require' name='vmx-exit-save-efer'/>
+      <feature policy='require' name='vmx-exit-load-efer'/>
+      <feature policy='require' name='vmx-exit-save-preemption-timer'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>

tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml

@@ -115,6 +115,13 @@
       <feature policy='require' name='vmx-monitor-exit'/>
       <feature policy='require' name='vmx-pause-exit'/>
       <feature policy='require' name='vmx-secondary-ctls'/>
+      <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+      <feature policy='require' name='vmx-exit-ack-intr'/>
+      <feature policy='require' name='vmx-exit-save-pat'/>
+      <feature policy='require' name='vmx-exit-load-pat'/>
+      <feature policy='require' name='vmx-exit-save-efer'/>
+      <feature policy='require' name='vmx-exit-load-efer'/>
+      <feature policy='require' name='vmx-exit-save-preemption-timer'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>

tests/domaincapsdata/qemu_5.0.0.x86_64.xml

@@ -114,6 +114,13 @@
       <feature policy='require' name='vmx-monitor-exit'/>
       <feature policy='require' name='vmx-pause-exit'/>
       <feature policy='require' name='vmx-secondary-ctls'/>
+      <feature policy='require' name='vmx-exit-nosave-debugctl'/>
+      <feature policy='require' name='vmx-exit-ack-intr'/>
+      <feature policy='require' name='vmx-exit-save-pat'/>
+      <feature policy='require' name='vmx-exit-load-pat'/>
+      <feature policy='require' name='vmx-exit-save-efer'/>
+      <feature policy='require' name='vmx-exit-load-efer'/>
+      <feature policy='require' name='vmx-exit-save-preemption-timer'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>

tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-4.2.0.args

@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-4.2,usb=off,dump-guest-core=off \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on \
+-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-5.0.0.args

@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-5.0,usb=off,dump-guest-core=off \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on \
+-cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,pschange-mc-no=on,vmx-ins-outs=on,vmx-true-ctls=on,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=on,vmx-apicv-xapic=on,vmx-ept=on,vmx-desc-exit=on,vmx-rdtscp-exit=on,vmx-apicv-x2apic=on,vmx-vpid=on,vmx-wbinvd-exit=on,vmx-unrestricted-guest=on,vmx-rdrand-exit=on,vmx-invpcid-exit=on,vmx-vmfunc=on,vmx-shadow-vmcs=on,vmx-rdseed-exit=on,vmx-pml=on,vmx-xsaves=on,vmx-invvpid=on,vmx-invvpid-single-addr=on,vmx-invvpid-all-context=on,vmx-ept-execonly=on,vmx-page-walk-4=on,vmx-ept-2mb=on,vmx-ept-1gb=on,vmx-invept=on,vmx-eptad=on,vmx-invept-single-context=on,vmx-invept-all-context=on,vmx-intr-exit=on,vmx-nmi-exit=on,vmx-vnmi=on,vmx-preemption-timer=on,vmx-vintr-pending=on,vmx-tsc-offset=on,vmx-hlt-exit=on,vmx-invlpg-exit=on,vmx-mwait-exit=on,vmx-rdpmc-exit=on,vmx-rdtsc-exit=on,vmx-cr3-load-noexit=on,vmx-cr3-store-noexit=on,vmx-cr8-load-exit=on,vmx-cr8-store-exit=on,vmx-flexpriority=on,vmx-vnmi-pending=on,vmx-movdr-exit=on,vmx-io-exit=on,vmx-io-bitmap=on,vmx-mtf=on,vmx-msr-bitmap=on,vmx-monitor-exit=on,vmx-pause-exit=on,vmx-secondary-ctls=on,vmx-exit-nosave-debugctl=on,vmx-exit-ack-intr=on,vmx-exit-save-pat=on,vmx-exit-load-pat=on,vmx-exit-save-efer=on,vmx-exit-load-efer=on,vmx-exit-save-preemption-timer=on \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \