From a1862e3de2e6c3d4f656f5c2b0ddfbdf638c84c3 Mon Sep 17 00:00:00 2001
From: Tim Wiederhake <twiederh@redhat.com>
Date: Thu, 9 Nov 2023 14:35:39 +0100
Subject: [PATCH] cpu_map: Add missing vmx features from MSR 0x485

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/cpu_map/x86_features.xml                  | 19 +++++++++++++++++++
 .../x86_64-cpuid-Atom-P5362-enabled.xml       |  1 +
 .../x86_64-cpuid-Atom-P5362-json.xml          |  3 +++
 .../x86_64-cpuid-Cooperlake-enabled.xml       |  1 +
 .../x86_64-cpuid-Cooperlake-json.xml          |  3 +++
 .../x86_64-cpuid-Core-i7-8550U-enabled.xml    |  1 +
 .../x86_64-cpuid-Core-i7-8550U-json.xml       |  3 +++
 ...86_64-cpuid-Xeon-Platinum-9242-enabled.xml |  1 +
 .../x86_64-cpuid-Xeon-Platinum-9242-json.xml  |  3 +++
 ...-cpuid-baseline-Cooperlake+Cascadelake.xml |  3 +++
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |  3 +++
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |  3 +++
 .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |  3 +++
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |  3 +++
 .../cpu-host-model-kvm.x86_64-4.2.0.args      |  2 +-
 .../cpu-host-model-kvm.x86_64-5.0.0.args      |  2 +-
 16 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 407cf65acc..c17a76aeb8 100644
--- 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 d294f3bc85..2508e56694 100644
--- 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 717ef008d4..2c5a1e3dfe 100644
--- 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 adfb882881..1e56a64fef 100644
--- 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 8dd5ebbc05..082c526606 100644
--- 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 9e0de97f63..db7f67163a 100644
--- 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 4056f4bcac..748817c533 100644
--- 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 4b1c06e18f..d404229290 100644
--- 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 1593e37302..3c46045396 100644
--- 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 63fcf0cf43..afd525ada0 100644
--- 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 03df6677e1..bf65363e24 100644
--- 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 a4230b2465..e5b0a97a90 100644
--- 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 ce1a0a9cfe..e6aea45834 100644
--- 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 0f21fb43c9..b3cd733217 100644
--- 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 8caaa1872d..dd5d3fdeb8 100644
--- 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 930336672c..472d1f70ef 100644
--- 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 \