cpu_map: Add missing vmx features from MSR 0x485

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

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 407cf65acc7c9867f33be1fca759ee172166c142..c17a76aeb8df230ecaf0a9b4a08de7de55124ac4 100644 (file)
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -796,4 +796,23 @@
   <feature name='vmx-any-errcode'>
     <msr index='0x480' edx='0x01000000' eax='0x00000000'/>
   </feature>
+
+  <feature name='vmx-store-lma'>
+    <msr index='0x485' edx='0x00000000' eax='0x00000020'/>
+  </feature>
+  <feature name='vmx-activity-hlt'>
+    <msr index='0x485' edx='0x00000000' eax='0x00000040'/>
+  </feature>
+  <feature name='vmx-activity-shutdown'>
+    <msr index='0x485' edx='0x00000000' eax='0x00000080'/>
+  </feature>
+  <feature name='vmx-activity-wait-sipi'>
+    <msr index='0x485' edx='0x00000000' eax='0x00000100'/>
+  </feature>
+  <feature name='vmx-vmwrite-vmexit-fields'>
+    <msr index='0x485' edx='0x00000000' eax='0x20000000'/>
+  </feature>
+  <feature name='vmx-zero-len-inject'>
+    <msr index='0x485' edx='0x00000000' eax='0x40000000'/>
+  </feature>
 </cpus>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml
index d294f3bc85ae6a81ec0566be0be1b4b5c0b93666..2508e566946028c271dd4583d354ffe65a3f3377 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml
@@ -8,4 +8,5 @@
   <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x01009000' ecx='0x00000000' edx='0x00000000'/>
   <msr index='0x10a' edx='0x00000000' eax='0x0000006b'/>
   <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
+  <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
index 717ef008d433b0decb455059fa31dedea4e15742..2c5a1e3dfe33a2ba01ab6611bfb3de838e3826b8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
@@ -20,6 +20,9 @@
   <feature policy='require' name='pschange-mc-no'/>
   <feature policy='require' name='vmx-ins-outs'/>
   <feature policy='require' name='vmx-true-ctls'/>
+  <feature policy='require' name='vmx-store-lma'/>
+  <feature policy='require' name='vmx-activity-hlt'/>
+  <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
   <feature policy='disable' name='mpx'/>
   <feature policy='disable' name='core-capability'/>
   <feature policy='disable' name='pdpe1gb'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
index adfb8828815d552c53e3e5474d150cdb497bb1ab..1e56a64fef07639ea326cc0de565c6946c3b31d5 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
@@ -9,4 +9,5 @@
   <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x01009000' ecx='0x00000000' edx='0x00000000'/>
   <msr index='0x10a' edx='0x00000000' eax='0x000001eb'/>
   <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
+  <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
index 8dd5ebbc059383bb56e3020c14db94e0f736b0ae..082c5266068f72212caaf9dcbad2c6a299dded05 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
@@ -15,4 +15,7 @@
   <feature policy='require' name='tsx-ctrl'/>
   <feature policy='require' name='vmx-ins-outs'/>
   <feature policy='require' name='vmx-true-ctls'/>
+  <feature policy='require' name='vmx-store-lma'/>
+  <feature policy='require' name='vmx-activity-hlt'/>
+  <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
index 9e0de97f636184b27be221bb0d9633eaeab2064e..db7f67163a2c187b3d3e4f090eda65198f50fd32 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
@@ -7,4 +7,5 @@
   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
   <msr index='0x10a' edx='0x00000000' eax='0x00000048'/>
   <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
+  <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
index 4056f4bcac4fc7689385ba302b7b36d6c3091897..748817c53342184a958a1ac52b5a695b8e9b9cd0 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
@@ -17,6 +17,9 @@
   <feature policy='require' name='pschange-mc-no'/>
   <feature policy='require' name='vmx-ins-outs'/>
   <feature policy='require' name='vmx-true-ctls'/>
+  <feature policy='require' name='vmx-store-lma'/>
+  <feature policy='require' name='vmx-activity-hlt'/>
+  <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
   <feature policy='disable' name='hle'/>
   <feature policy='disable' name='rtm'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
index 4b1c06e18f2f0d8a681ebd87cee6487a66169706..d404229290848189ec7e8cb001457f3293aee6c9 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
@@ -8,4 +8,5 @@
   <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x01001000' ecx='0x00000000' edx='0x00000000'/>
   <msr index='0x10a' edx='0x00000000' eax='0x000000eb'/>
   <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
+  <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
 </cpudata>

diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
index 1593e373028c25005bc7e790fc8cd5564809f324..3c46045396b34509ad2a1eb68690f8becf6d4dbd 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
@@ -21,4 +21,7 @@
   <feature policy='require' name='tsx-ctrl'/>
   <feature policy='require' name='vmx-ins-outs'/>
   <feature policy='require' name='vmx-true-ctls'/>
+  <feature policy='require' name='vmx-store-lma'/>
+  <feature policy='require' name='vmx-activity-hlt'/>
+  <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
index 63fcf0cf43ee67d239d4b0afd2a926cfed24d8af..afd525ada0ce2c6dc73e5ecacd374f089c1475d3 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
@@ -21,4 +21,7 @@
   <feature policy='require' name='tsx-ctrl'/>
   <feature policy='require' name='vmx-ins-outs'/>
   <feature policy='require' name='vmx-true-ctls'/>
+  <feature policy='require' name='vmx-store-lma'/>
+  <feature policy='require' name='vmx-activity-hlt'/>
+  <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
 </cpu>

diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index 03df6677e18382c911cf9f6ffcce9f74295bffda..bf65363e248842ae366a6f98df7738f613a51490 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -61,6 +61,9 @@
       <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='vmx-ins-outs'/>
       <feature policy='require' name='vmx-true-ctls'/>
+      <feature policy='require' name='vmx-store-lma'/>
+      <feature policy='require' name='vmx-activity-hlt'/>
+      <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index a4230b2465dbeb12c252e9d4c185009d3b13ff04..e5b0a97a90376d91e9abad213acb9be8fc7b923c 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -60,6 +60,9 @@
       <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='vmx-ins-outs'/>
       <feature policy='require' name='vmx-true-ctls'/>
+      <feature policy='require' name='vmx-store-lma'/>
+      <feature policy='require' name='vmx-activity-hlt'/>
+      <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
index ce1a0a9cfe3f9141ada6edde9ae67eba101ff6c2..e6aea458343c5b3ee8be96674b892162f6fe25ac 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -61,6 +61,9 @@
       <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='vmx-ins-outs'/>
       <feature policy='require' name='vmx-true-ctls'/>
+      <feature policy='require' name='vmx-store-lma'/>
+      <feature policy='require' name='vmx-activity-hlt'/>
+      <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>

diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index 0f21fb43c93aa09d098265a4749e1e75ffd64d2a..b3cd733217b3e1bb4dd8df7c871ded5cae2ef66a 100644 (file)
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -60,6 +60,9 @@
       <feature policy='require' name='pschange-mc-no'/>
       <feature policy='require' name='vmx-ins-outs'/>
       <feature policy='require' name='vmx-true-ctls'/>
+      <feature policy='require' name='vmx-store-lma'/>
+      <feature policy='require' name='vmx-activity-hlt'/>
+      <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
     </mode>
     <mode name='custom' supported='yes'>
       <model usable='yes' vendor='unknown'>qemu64</model>

diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-4.2.0.args b/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-4.2.0.args
index 8caaa1872d249919437afc48e5104dca03b911af..dd5d3fdeb8ea1a2f12be9612a1056d7441777fc7 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-4.2.0.args
+++ b/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 \
+-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 \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-5.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-5.0.0.args
index 930336672cb63535990624f373631750bab418bf..472d1f70efe926faed6828dec7f49844374a8adf 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-5.0.0.args
+++ b/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 \
+-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 \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \