cpu_map: Add missing vmx features from MSR 0x48D

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

src/cpu_map/x86_features.xml

@@ -932,4 +932,20 @@
   <feature name='vmx-invept-all-context'>
     <msr index='0x48c' edx='0x00000000' eax='0x04000000'/>
   </feature>
+
+  <feature name='vmx-intr-exit'>
+    <msr index='0x48d' edx='0x00000000' eax='0x00000001'/>
+  </feature>
+  <feature name='vmx-nmi-exit'>
+    <msr index='0x48d' edx='0x00000000' eax='0x00000008'/>
+  </feature>
+  <feature name='vmx-vnmi'>
+    <msr index='0x48d' edx='0x00000000' eax='0x00000020'/>
+  </feature>
+  <feature name='vmx-preemption-timer'>
+    <msr index='0x48d' edx='0x00000000' eax='0x00000040'/>
+  </feature>
+  <feature name='vmx-posted-intr'>
+    <msr index='0x48d' edx='0x00000000' eax='0x00000080'/>
+  </feature>
 </cpus>

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

@@ -11,4 +11,5 @@
   <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
   <msr index='0x48b' edx='0x00000000' eax='0x00136bff'/>
   <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
+  <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
 </cpudata>

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

@@ -50,6 +50,11 @@
   <feature policy='require' name='vmx-eptad'/>
   <feature policy='require' name='vmx-invept-single-context'/>
   <feature policy='require' name='vmx-invept-all-context'/>
+  <feature policy='require' name='vmx-intr-exit'/>
+  <feature policy='require' name='vmx-nmi-exit'/>
+  <feature policy='require' name='vmx-vnmi'/>
+  <feature policy='require' name='vmx-preemption-timer'/>
+  <feature policy='require' name='vmx-posted-intr'/>
   <feature policy='disable' name='mpx'/>
   <feature policy='disable' name='core-capability'/>
   <feature policy='disable' name='pdpe1gb'/>

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

@@ -12,4 +12,5 @@
   <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
   <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/>
   <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
+  <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
 </cpudata>

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

@@ -46,4 +46,9 @@
   <feature policy='require' name='vmx-eptad'/>
   <feature policy='require' name='vmx-invept-single-context'/>
   <feature policy='require' name='vmx-invept-all-context'/>
+  <feature policy='require' name='vmx-intr-exit'/>
+  <feature policy='require' name='vmx-nmi-exit'/>
+  <feature policy='require' name='vmx-vnmi'/>
+  <feature policy='require' name='vmx-preemption-timer'/>
+  <feature policy='require' name='vmx-posted-intr'/>
 </cpu>

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

@@ -10,4 +10,5 @@
   <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
   <msr index='0x48b' edx='0x00000000' eax='0x001378ff'/>
   <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
+  <msr index='0x48d' edx='0x00000000' eax='0x00000069'/>
 </cpudata>

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

@@ -46,6 +46,10 @@
   <feature policy='require' name='vmx-eptad'/>
   <feature policy='require' name='vmx-invept-single-context'/>
   <feature policy='require' name='vmx-invept-all-context'/>
+  <feature policy='require' name='vmx-intr-exit'/>
+  <feature policy='require' name='vmx-nmi-exit'/>
+  <feature policy='require' name='vmx-vnmi'/>
+  <feature policy='require' name='vmx-preemption-timer'/>
   <feature policy='disable' name='hle'/>
   <feature policy='disable' name='rtm'/>
 </cpu>

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

@@ -11,4 +11,5 @@
   <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
   <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/>
   <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
+  <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
 </cpudata>

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

@@ -52,4 +52,9 @@
   <feature policy='require' name='vmx-eptad'/>
   <feature policy='require' name='vmx-invept-single-context'/>
   <feature policy='require' name='vmx-invept-all-context'/>
+  <feature policy='require' name='vmx-intr-exit'/>
+  <feature policy='require' name='vmx-nmi-exit'/>
+  <feature policy='require' name='vmx-vnmi'/>
+  <feature policy='require' name='vmx-preemption-timer'/>
+  <feature policy='require' name='vmx-posted-intr'/>
 </cpu>

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

@@ -52,4 +52,9 @@
   <feature policy='require' name='vmx-eptad'/>
   <feature policy='require' name='vmx-invept-single-context'/>
   <feature policy='require' name='vmx-invept-all-context'/>
+  <feature policy='require' name='vmx-intr-exit'/>
+  <feature policy='require' name='vmx-nmi-exit'/>
+  <feature policy='require' name='vmx-vnmi'/>
+  <feature policy='require' name='vmx-preemption-timer'/>
+  <feature policy='require' name='vmx-posted-intr'/>
 </cpu>

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

@@ -90,6 +90,10 @@
       <feature policy='require' name='vmx-eptad'/>
       <feature policy='require' name='vmx-invept-single-context'/>
       <feature policy='require' name='vmx-invept-all-context'/>
+      <feature policy='require' name='vmx-intr-exit'/>
+      <feature policy='require' name='vmx-nmi-exit'/>
+      <feature policy='require' name='vmx-vnmi'/>
+      <feature policy='require' name='vmx-preemption-timer'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>

tests/domaincapsdata/qemu_4.2.0.x86_64.xml

@@ -89,6 +89,10 @@
       <feature policy='require' name='vmx-eptad'/>
       <feature policy='require' name='vmx-invept-single-context'/>
       <feature policy='require' name='vmx-invept-all-context'/>
+      <feature policy='require' name='vmx-intr-exit'/>
+      <feature policy='require' name='vmx-nmi-exit'/>
+      <feature policy='require' name='vmx-vnmi'/>
+      <feature policy='require' name='vmx-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

@@ -90,6 +90,10 @@
       <feature policy='require' name='vmx-eptad'/>
       <feature policy='require' name='vmx-invept-single-context'/>
       <feature policy='require' name='vmx-invept-all-context'/>
+      <feature policy='require' name='vmx-intr-exit'/>
+      <feature policy='require' name='vmx-nmi-exit'/>
+      <feature policy='require' name='vmx-vnmi'/>
+      <feature policy='require' name='vmx-preemption-timer'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>

tests/domaincapsdata/qemu_5.0.0.x86_64.xml

@@ -89,6 +89,10 @@
       <feature policy='require' name='vmx-eptad'/>
       <feature policy='require' name='vmx-invept-single-context'/>
       <feature policy='require' name='vmx-invept-all-context'/>
+      <feature policy='require' name='vmx-intr-exit'/>
+      <feature policy='require' name='vmx-nmi-exit'/>
+      <feature policy='require' name='vmx-vnmi'/>
+      <feature policy='require' name='vmx-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 \
+-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 \
 -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 \
+-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 \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \