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

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/cpu_map/x86_features.xml                  | 64 +++++++++++++++++++
 .../x86_64-cpuid-Atom-P5362-enabled.xml       |  1 +
 .../x86_64-cpuid-Atom-P5362-json.xml          | 16 +++++
 .../x86_64-cpuid-Cooperlake-enabled.xml       |  1 +
 .../x86_64-cpuid-Cooperlake-json.xml          | 17 +++++
 .../x86_64-cpuid-Core-i7-8550U-enabled.xml    |  1 +
 .../x86_64-cpuid-Core-i7-8550U-json.xml       | 15 +++++
 ...86_64-cpuid-Xeon-Platinum-9242-enabled.xml |  1 +
 .../x86_64-cpuid-Xeon-Platinum-9242-json.xml  | 17 +++++
 ...-cpuid-baseline-Cooperlake+Cascadelake.xml | 17 +++++
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  | 15 +++++
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    | 15 +++++
 .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  | 15 +++++
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml    | 15 +++++
 .../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, 212 insertions(+), 2 deletions(-)

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index c17a76aeb8..7b6ff44c20 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -815,4 +815,68 @@
   <feature name='vmx-zero-len-inject'>
     <msr index='0x485' edx='0x00000000' eax='0x40000000'/>
   </feature>
+
+  <feature name='vmx-apicv-xapic'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00000001'/>
+  </feature>
+  <feature name='vmx-ept'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00000002'/>
+  </feature>
+  <feature name='vmx-desc-exit'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00000004'/>
+  </feature>
+  <feature name='vmx-rdtscp-exit'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00000008'/>
+  </feature>
+  <feature name='vmx-apicv-x2apic'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00000010'/>
+  </feature>
+  <feature name='vmx-vpid'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00000020'/>
+  </feature>
+  <feature name='vmx-wbinvd-exit'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00000040'/>
+  </feature>
+  <feature name='vmx-unrestricted-guest'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00000080'/>
+  </feature>
+  <feature name='vmx-apicv-register'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00000100'/>
+  </feature>
+  <feature name='vmx-apicv-vid'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00000200'/>
+  </feature>
+  <feature name='vmx-ple'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00000400'/>
+  </feature>
+  <feature name='vmx-rdrand-exit'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00000800'/>
+  </feature>
+  <feature name='vmx-invpcid-exit'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00001000'/>
+  </feature>
+  <feature name='vmx-vmfunc'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00002000'/>
+  </feature>
+  <feature name='vmx-shadow-vmcs'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00004000'/>
+  </feature>
+  <feature name='vmx-encls-exit'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00008000'/>
+  </feature>
+  <feature name='vmx-rdseed-exit'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00010000'/>
+  </feature>
+  <feature name='vmx-pml'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00020000'/>
+  </feature>
+  <feature name='vmx-xsaves'>
+    <msr index='0x48b' edx='0x00000000' eax='0x00100000'/>
+  </feature>
+  <feature name='vmx-tsc-scaling'>
+    <msr index='0x48b' edx='0x00000000' eax='0x02000000'/>
+  </feature>
+  <feature name='vmx-enable-user-wait-pause'>
+    <msr index='0x48b' edx='0x00000000' eax='0x04000000'/>
+  </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 2508e56694..7a1f047382 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml
@@ -9,4 +9,5 @@
   <msr index='0x10a' edx='0x00000000' eax='0x0000006b'/>
   <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
   <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
+  <msr index='0x48b' edx='0x00000000' eax='0x00136bff'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
index 2c5a1e3dfe..bb4259058a 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
@@ -23,6 +23,22 @@
   <feature policy='require' name='vmx-store-lma'/>
   <feature policy='require' name='vmx-activity-hlt'/>
   <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
+  <feature policy='require' name='vmx-apicv-xapic'/>
+  <feature policy='require' name='vmx-ept'/>
+  <feature policy='require' name='vmx-desc-exit'/>
+  <feature policy='require' name='vmx-rdtscp-exit'/>
+  <feature policy='require' name='vmx-apicv-x2apic'/>
+  <feature policy='require' name='vmx-vpid'/>
+  <feature policy='require' name='vmx-wbinvd-exit'/>
+  <feature policy='require' name='vmx-unrestricted-guest'/>
+  <feature policy='require' name='vmx-apicv-register'/>
+  <feature policy='require' name='vmx-apicv-vid'/>
+  <feature policy='require' name='vmx-rdrand-exit'/>
+  <feature policy='require' name='vmx-vmfunc'/>
+  <feature policy='require' name='vmx-shadow-vmcs'/>
+  <feature policy='require' name='vmx-rdseed-exit'/>
+  <feature policy='require' name='vmx-pml'/>
+  <feature policy='require' name='vmx-xsaves'/>
   <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 1e56a64fef..01d81a64a6 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
@@ -10,4 +10,5 @@
   <msr index='0x10a' edx='0x00000000' eax='0x000001eb'/>
   <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
   <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
+  <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
index 082c526606..bb1d2f628c 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
@@ -18,4 +18,21 @@
   <feature policy='require' name='vmx-store-lma'/>
   <feature policy='require' name='vmx-activity-hlt'/>
   <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
+  <feature policy='require' name='vmx-apicv-xapic'/>
+  <feature policy='require' name='vmx-ept'/>
+  <feature policy='require' name='vmx-desc-exit'/>
+  <feature policy='require' name='vmx-rdtscp-exit'/>
+  <feature policy='require' name='vmx-apicv-x2apic'/>
+  <feature policy='require' name='vmx-vpid'/>
+  <feature policy='require' name='vmx-wbinvd-exit'/>
+  <feature policy='require' name='vmx-unrestricted-guest'/>
+  <feature policy='require' name='vmx-apicv-register'/>
+  <feature policy='require' name='vmx-apicv-vid'/>
+  <feature policy='require' name='vmx-rdrand-exit'/>
+  <feature policy='require' name='vmx-invpcid-exit'/>
+  <feature policy='require' name='vmx-vmfunc'/>
+  <feature policy='require' name='vmx-shadow-vmcs'/>
+  <feature policy='require' name='vmx-rdseed-exit'/>
+  <feature policy='require' name='vmx-pml'/>
+  <feature policy='require' name='vmx-xsaves'/>
 </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 db7f67163a..1bf7882b2e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
@@ -8,4 +8,5 @@
   <msr index='0x10a' edx='0x00000000' eax='0x00000048'/>
   <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
   <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
+  <msr index='0x48b' edx='0x00000000' eax='0x001378ff'/>
 </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 748817c533..e150ef4004 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
@@ -20,6 +20,21 @@
   <feature policy='require' name='vmx-store-lma'/>
   <feature policy='require' name='vmx-activity-hlt'/>
   <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
+  <feature policy='require' name='vmx-apicv-xapic'/>
+  <feature policy='require' name='vmx-ept'/>
+  <feature policy='require' name='vmx-desc-exit'/>
+  <feature policy='require' name='vmx-rdtscp-exit'/>
+  <feature policy='require' name='vmx-apicv-x2apic'/>
+  <feature policy='require' name='vmx-vpid'/>
+  <feature policy='require' name='vmx-wbinvd-exit'/>
+  <feature policy='require' name='vmx-unrestricted-guest'/>
+  <feature policy='require' name='vmx-rdrand-exit'/>
+  <feature policy='require' name='vmx-invpcid-exit'/>
+  <feature policy='require' name='vmx-vmfunc'/>
+  <feature policy='require' name='vmx-shadow-vmcs'/>
+  <feature policy='require' name='vmx-rdseed-exit'/>
+  <feature policy='require' name='vmx-pml'/>
+  <feature policy='require' name='vmx-xsaves'/>
   <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 d404229290..b7ffbb2708 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
@@ -9,4 +9,5 @@
   <msr index='0x10a' edx='0x00000000' eax='0x000000eb'/>
   <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
   <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
+  <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/>
 </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 3c46045396..2813c72012 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
@@ -24,4 +24,21 @@
   <feature policy='require' name='vmx-store-lma'/>
   <feature policy='require' name='vmx-activity-hlt'/>
   <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
+  <feature policy='require' name='vmx-apicv-xapic'/>
+  <feature policy='require' name='vmx-ept'/>
+  <feature policy='require' name='vmx-desc-exit'/>
+  <feature policy='require' name='vmx-rdtscp-exit'/>
+  <feature policy='require' name='vmx-apicv-x2apic'/>
+  <feature policy='require' name='vmx-vpid'/>
+  <feature policy='require' name='vmx-wbinvd-exit'/>
+  <feature policy='require' name='vmx-unrestricted-guest'/>
+  <feature policy='require' name='vmx-apicv-register'/>
+  <feature policy='require' name='vmx-apicv-vid'/>
+  <feature policy='require' name='vmx-rdrand-exit'/>
+  <feature policy='require' name='vmx-invpcid-exit'/>
+  <feature policy='require' name='vmx-vmfunc'/>
+  <feature policy='require' name='vmx-shadow-vmcs'/>
+  <feature policy='require' name='vmx-rdseed-exit'/>
+  <feature policy='require' name='vmx-pml'/>
+  <feature policy='require' name='vmx-xsaves'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
index afd525ada0..ca6387e390 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
@@ -24,4 +24,21 @@
   <feature policy='require' name='vmx-store-lma'/>
   <feature policy='require' name='vmx-activity-hlt'/>
   <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
+  <feature policy='require' name='vmx-apicv-xapic'/>
+  <feature policy='require' name='vmx-ept'/>
+  <feature policy='require' name='vmx-desc-exit'/>
+  <feature policy='require' name='vmx-rdtscp-exit'/>
+  <feature policy='require' name='vmx-apicv-x2apic'/>
+  <feature policy='require' name='vmx-vpid'/>
+  <feature policy='require' name='vmx-wbinvd-exit'/>
+  <feature policy='require' name='vmx-unrestricted-guest'/>
+  <feature policy='require' name='vmx-apicv-register'/>
+  <feature policy='require' name='vmx-apicv-vid'/>
+  <feature policy='require' name='vmx-rdrand-exit'/>
+  <feature policy='require' name='vmx-invpcid-exit'/>
+  <feature policy='require' name='vmx-vmfunc'/>
+  <feature policy='require' name='vmx-shadow-vmcs'/>
+  <feature policy='require' name='vmx-rdseed-exit'/>
+  <feature policy='require' name='vmx-pml'/>
+  <feature policy='require' name='vmx-xsaves'/>
 </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 bf65363e24..398a027e92 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -64,6 +64,21 @@
       <feature policy='require' name='vmx-store-lma'/>
       <feature policy='require' name='vmx-activity-hlt'/>
       <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
+      <feature policy='require' name='vmx-apicv-xapic'/>
+      <feature policy='require' name='vmx-ept'/>
+      <feature policy='require' name='vmx-desc-exit'/>
+      <feature policy='require' name='vmx-rdtscp-exit'/>
+      <feature policy='require' name='vmx-apicv-x2apic'/>
+      <feature policy='require' name='vmx-vpid'/>
+      <feature policy='require' name='vmx-wbinvd-exit'/>
+      <feature policy='require' name='vmx-unrestricted-guest'/>
+      <feature policy='require' name='vmx-rdrand-exit'/>
+      <feature policy='require' name='vmx-invpcid-exit'/>
+      <feature policy='require' name='vmx-vmfunc'/>
+      <feature policy='require' name='vmx-shadow-vmcs'/>
+      <feature policy='require' name='vmx-rdseed-exit'/>
+      <feature policy='require' name='vmx-pml'/>
+      <feature policy='require' name='vmx-xsaves'/>
     </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 e5b0a97a90..446bf915a5 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -63,6 +63,21 @@
       <feature policy='require' name='vmx-store-lma'/>
       <feature policy='require' name='vmx-activity-hlt'/>
       <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
+      <feature policy='require' name='vmx-apicv-xapic'/>
+      <feature policy='require' name='vmx-ept'/>
+      <feature policy='require' name='vmx-desc-exit'/>
+      <feature policy='require' name='vmx-rdtscp-exit'/>
+      <feature policy='require' name='vmx-apicv-x2apic'/>
+      <feature policy='require' name='vmx-vpid'/>
+      <feature policy='require' name='vmx-wbinvd-exit'/>
+      <feature policy='require' name='vmx-unrestricted-guest'/>
+      <feature policy='require' name='vmx-rdrand-exit'/>
+      <feature policy='require' name='vmx-invpcid-exit'/>
+      <feature policy='require' name='vmx-vmfunc'/>
+      <feature policy='require' name='vmx-shadow-vmcs'/>
+      <feature policy='require' name='vmx-rdseed-exit'/>
+      <feature policy='require' name='vmx-pml'/>
+      <feature policy='require' name='vmx-xsaves'/>
     </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 e6aea45834..c1dd623709 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -64,6 +64,21 @@
       <feature policy='require' name='vmx-store-lma'/>
       <feature policy='require' name='vmx-activity-hlt'/>
       <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
+      <feature policy='require' name='vmx-apicv-xapic'/>
+      <feature policy='require' name='vmx-ept'/>
+      <feature policy='require' name='vmx-desc-exit'/>
+      <feature policy='require' name='vmx-rdtscp-exit'/>
+      <feature policy='require' name='vmx-apicv-x2apic'/>
+      <feature policy='require' name='vmx-vpid'/>
+      <feature policy='require' name='vmx-wbinvd-exit'/>
+      <feature policy='require' name='vmx-unrestricted-guest'/>
+      <feature policy='require' name='vmx-rdrand-exit'/>
+      <feature policy='require' name='vmx-invpcid-exit'/>
+      <feature policy='require' name='vmx-vmfunc'/>
+      <feature policy='require' name='vmx-shadow-vmcs'/>
+      <feature policy='require' name='vmx-rdseed-exit'/>
+      <feature policy='require' name='vmx-pml'/>
+      <feature policy='require' name='vmx-xsaves'/>
     </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 b3cd733217..4618fd24e4 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -63,6 +63,21 @@
       <feature policy='require' name='vmx-store-lma'/>
       <feature policy='require' name='vmx-activity-hlt'/>
       <feature policy='require' name='vmx-vmwrite-vmexit-fields'/>
+      <feature policy='require' name='vmx-apicv-xapic'/>
+      <feature policy='require' name='vmx-ept'/>
+      <feature policy='require' name='vmx-desc-exit'/>
+      <feature policy='require' name='vmx-rdtscp-exit'/>
+      <feature policy='require' name='vmx-apicv-x2apic'/>
+      <feature policy='require' name='vmx-vpid'/>
+      <feature policy='require' name='vmx-wbinvd-exit'/>
+      <feature policy='require' name='vmx-unrestricted-guest'/>
+      <feature policy='require' name='vmx-rdrand-exit'/>
+      <feature policy='require' name='vmx-invpcid-exit'/>
+      <feature policy='require' name='vmx-vmfunc'/>
+      <feature policy='require' name='vmx-shadow-vmcs'/>
+      <feature policy='require' name='vmx-rdseed-exit'/>
+      <feature policy='require' name='vmx-pml'/>
+      <feature policy='require' name='vmx-xsaves'/>
     </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 dd5d3fdeb8..22e4023886 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,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=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 \
 -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 472d1f70ef..df890b9f89 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,vmx-store-lma=on,vmx-activity-hlt=on,vmx-vmwrite-vmexit-fields=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 \
 -m size=219136k \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
-- 
2.39.5