qemu: Translate vmx-invvpid-single-context-noglobals CPU feature

This feature is called "vmx-invept-single-context-noglobals" in QEMU and
our CPU map even contains the appropriate alias. But we failed to
actually translate the name when talking to QEMU.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6a0f3e2ab7b7c6c2e11275d8f944094789c67e5e..1d7ac9803d9e4f9744d119873e83c8e85aa69c24 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3570,6 +3570,7 @@ virQEMUCapsCPUFeatureTranslationTable virQEMUCapsCPUFeaturesX86[] = {
     {"perfctr_core", "perfctr-core"},
     {"perfctr_nb", "perfctr-nb"},
     {"tsc_adjust", "tsc-adjust"},
+    {"vmx-invvpid-single-context-noglobals", "vmx-invept-single-context-noglobals"},
     {NULL, NULL}
 };
 

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml
index 80c24facdf2ea736097736b720f309eed456515a..77613d60714c72196f1369aa29dc49f598a535c8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-enabled.xml
@@ -10,7 +10,7 @@
   <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
   <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
   <msr index='0x48b' edx='0x00000000' eax='0x00136bff'/>
-  <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
+  <msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
   <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
   <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
index b334e9062c6285195b9a7540a9894800fdd8e6a7..ed30dfe0084ab24a195c4b951b98b1b5ac455dd7 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
@@ -50,6 +50,7 @@
   <feature policy='require' name='vmx-invvpid'/>
   <feature policy='require' name='vmx-invvpid-single-addr'/>
   <feature policy='require' name='vmx-invvpid-all-context'/>
+  <feature policy='require' name='vmx-invvpid-single-context-noglobals'/>
   <feature policy='require' name='vmx-intr-exit'/>
   <feature policy='require' name='vmx-nmi-exit'/>
   <feature policy='require' name='vmx-vnmi'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
index c42a69d102faa1bae843f820019e5ad256d14097..08609a89a5fae5f8e96163ea02b2048579c6bde8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
@@ -11,7 +11,7 @@
   <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
   <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
   <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/>
-  <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
+  <msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
   <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
   <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>

diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
index 822deb46cf6f37d44f85e2eea077e35135bbcb4c..8d91a319a3a3b2630e602fdaa484a2a2a2b9ebd8 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
@@ -46,6 +46,7 @@
   <feature policy='require' name='vmx-invvpid'/>
   <feature policy='require' name='vmx-invvpid-single-addr'/>
   <feature policy='require' name='vmx-invvpid-all-context'/>
+  <feature policy='require' name='vmx-invvpid-single-context-noglobals'/>
   <feature policy='require' name='vmx-intr-exit'/>
   <feature policy='require' name='vmx-nmi-exit'/>
   <feature policy='require' name='vmx-vnmi'/>

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 19dd4f6f0c174e3639ac451f793ae5ba724fa6b6..424c2492bde80a129c80549ce920f3ca1f8553d9 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
@@ -9,7 +9,7 @@
   <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
   <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
   <msr index='0x48b' edx='0x00000000' eax='0x001378ff'/>
-  <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
+  <msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
   <msr index='0x48d' edx='0x00000000' eax='0x00000069'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
   <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>

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 5f7b2b49c49dcc40c617d1ccb0aa39fc37247760..662e88bc3b633625053820d83eb60cdabe119316 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
@@ -47,6 +47,7 @@
   <feature policy='require' name='vmx-invvpid'/>
   <feature policy='require' name='vmx-invvpid-single-addr'/>
   <feature policy='require' name='vmx-invvpid-all-context'/>
+  <feature policy='require' name='vmx-invvpid-single-context-noglobals'/>
   <feature policy='require' name='vmx-intr-exit'/>
   <feature policy='require' name='vmx-nmi-exit'/>
   <feature policy='require' name='vmx-vnmi'/>

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 b830c52b8ccabaf7c4fe6eb6d5f7d1c2aa627434..a8e24f23021991fe11d45681a4154f1a2b31a6cf 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
@@ -10,7 +10,7 @@
   <msr index='0x480' edx='0x00c00000' eax='0x00000000'/>
   <msr index='0x485' edx='0x00000000' eax='0x20000060'/>
   <msr index='0x48b' edx='0x00000000' eax='0x00137bff'/>
-  <msr index='0x48c' edx='0x00000501' eax='0x06330041'/>
+  <msr index='0x48c' edx='0x00000d01' eax='0x06330041'/>
   <msr index='0x48d' edx='0x00000000' eax='0x000000e9'/>
   <msr index='0x48e' edx='0x00000000' eax='0xfbf99e8c'/>
   <msr index='0x48f' edx='0x00000000' eax='0x007c8004'/>

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 46faf74879cde8dc99f83c2d83ae689c63b5ea00..38e15ab63dae3140ea9c21a267d60d8e0c23b179 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
@@ -53,6 +53,7 @@
   <feature policy='require' name='vmx-invvpid'/>
   <feature policy='require' name='vmx-invvpid-single-addr'/>
   <feature policy='require' name='vmx-invvpid-all-context'/>
+  <feature policy='require' name='vmx-invvpid-single-context-noglobals'/>
   <feature policy='require' name='vmx-intr-exit'/>
   <feature policy='require' name='vmx-nmi-exit'/>
   <feature policy='require' name='vmx-vnmi'/>

diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
index bd28239199d532011381209d77eb37a9b8bbe144..c5731093a7b2f0aab9f7b7e7e737330ffc66fc1f 100644 (file)
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
@@ -53,6 +53,7 @@
   <feature policy='require' name='vmx-invvpid'/>
   <feature policy='require' name='vmx-invvpid-single-addr'/>
   <feature policy='require' name='vmx-invvpid-all-context'/>
+  <feature policy='require' name='vmx-invvpid-single-context-noglobals'/>
   <feature policy='require' name='vmx-intr-exit'/>
   <feature policy='require' name='vmx-nmi-exit'/>
   <feature policy='require' name='vmx-vnmi'/>