cpu_map: Drop vmx-invvpid-single-context from CPU models

QEMU calls the same feature differently, but translating the names in
libvirt does not make sense because the name in QEMU conflicts with
another feature. QEMU will not change the name for compatibility reasons
so we can just drop our invented name as it is not supported by QEMU.
Apart from this slightly different reason behind the feature being
unsupported by QEMU the situation is similar to vmx-ept-{uc,wb} dropped
in the previous patch and so is the implications.

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

diff --git a/src/cpu_map/sync_qemu_features_i386.py b/src/cpu_map/sync_qemu_features_i386.py
index c78c0b2ac91304e705316b5ad0a87d357488e63c..15a7af85cb39b94600d708dab8e51ae5acd2adb3 100755 (executable)
--- a/src/cpu_map/sync_qemu_features_i386.py
+++ b/src/cpu_map/sync_qemu_features_i386.py
@@ -70,7 +70,6 @@ FEATURES_EXTRA = {
         18: "cvt16",
     },
     (0x0000048c,): {
-        41: "vmx-invvpid-single-context",               # wrong name in qemu
         43: "vmx-invvpid-single-context-noglobals",     # wrong name in qemu
     }
 }

diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py
index 408e07911ea7ee4d93a45696697389eae416f7e4..65ae03122342d3485e1cd0f293b565423bdc12ec 100755 (executable)
--- a/src/cpu_map/sync_qemu_models_i386.py
+++ b/src/cpu_map/sync_qemu_models_i386.py
@@ -287,7 +287,6 @@ def translate_feature(name):
         "MSR_VMX_EPT_INVEPT_ALL_CONTEXT": "vmx-invept-all-context",
         "MSR_VMX_EPT_INVVPID": "vmx-invvpid",
         "MSR_VMX_EPT_INVVPID_SINGLE_ADDR": "vmx-invvpid-single-addr",
-        "MSR_VMX_EPT_INVVPID_SINGLE_CONTEXT": "vmx-invvpid-single-context",
         "MSR_VMX_EPT_INVVPID_ALL_CONTEXT": "vmx-invvpid-all-context",
         "MSR_VMX_EPT_INVVPID_SINGLE_CONTEXT_NOGLOBALS": "vmx-invvpid-single-context-noglobals",
 
@@ -306,6 +305,7 @@ def translate_feature(name):
         name in ("MSR_VMX_BASIC_DUAL_MONITOR", "dual-monitor"),
         name in ("CPUID_EXT3_TOPOEXT", "topoext"),
         name in ("MSR_VMX_EPT_UC", "MSR_VMX_EPT_WB"),
+        name in ("MSR_VMX_EPT_INVVPID_SINGLE_CONTEXT"),
     ])
 
     if ignore:

diff --git a/src/cpu_map/x86_Broadwell-IBRS.xml b/src/cpu_map/x86_Broadwell-IBRS.xml
index e87f54a102e20c7e3147780634c9cfbcb28b750b..484593142054dcd0e989613c206d720d2935785a 100644 (file)
--- a/src/cpu_map/x86_Broadwell-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-IBRS.xml
@@ -100,7 +100,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
index 59c2c08937125c6fb0877402ce5b83b8c528e7eb..b1e7aa5d5e2096d4d19b486dbcac090cad6fb883 100644 (file)
--- a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
@@ -98,7 +98,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Broadwell-noTSX.xml b/src/cpu_map/x86_Broadwell-noTSX.xml
index b9b25d6b6c93e7263fa9a4d982739719448f8627..24aa6a37bd163341b1785255762bcfbc122aadb8 100644 (file)
--- a/src/cpu_map/x86_Broadwell-noTSX.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX.xml
@@ -97,7 +97,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Broadwell.xml b/src/cpu_map/x86_Broadwell.xml
index 2845a620ac0effe0d2cd7771ca5bc9aebe828e8b..1b27489db21ea04e733c12d27671ddeb9e4816d5 100644 (file)
--- a/src/cpu_map/x86_Broadwell.xml
+++ b/src/cpu_map/x86_Broadwell.xml
@@ -99,7 +99,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
index a3b332c9c16324a27e65def8c21f862a93ba711b..d1d49fdd583dd4b20e558b813da06268f9c8e467 100644 (file)
--- a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
@@ -111,7 +111,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Cascadelake-Server.xml b/src/cpu_map/x86_Cascadelake-Server.xml
index 9faad320e695aece0a0e9e0278acdd642b6c44e1..09840ce52fe6f0f04a0be1cf481376fe1e90cdfc 100644 (file)
--- a/src/cpu_map/x86_Cascadelake-Server.xml
+++ b/src/cpu_map/x86_Cascadelake-Server.xml
@@ -112,7 +112,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Cooperlake.xml b/src/cpu_map/x86_Cooperlake.xml
index caccfc048c8f5f7e5557f2997bed4931cecbbc39..8f37df60de798f505a3359e5a78351ca15382e68 100644 (file)
--- a/src/cpu_map/x86_Cooperlake.xml
+++ b/src/cpu_map/x86_Cooperlake.xml
@@ -122,7 +122,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_GraniteRapids.xml b/src/cpu_map/x86_GraniteRapids.xml
index 6dab7d7b09cf4d72044174e2572f13b8d7adda57..9a94476459a765f58878a75ef3c5b3b65132831c 100644 (file)
--- a/src/cpu_map/x86_GraniteRapids.xml
+++ b/src/cpu_map/x86_GraniteRapids.xml
@@ -151,7 +151,6 @@
     <feature name='vmx-invvpid'/>
     <feature name='vmx-invvpid-all-context'/>
     <feature name='vmx-invvpid-single-addr'/>
-    <feature name='vmx-invvpid-single-context'/>
     <feature name='vmx-invvpid-single-context-noglobals'/>
     <feature name='vmx-io-bitmap'/>
     <feature name='vmx-io-exit'/>

diff --git a/src/cpu_map/x86_Haswell-IBRS.xml b/src/cpu_map/x86_Haswell-IBRS.xml
index e2e3ce6b51263b8e9172ffe93c8e35373f3b0dc7..0fed6fbb78d48796164916055e1566a0d0d56918 100644 (file)
--- a/src/cpu_map/x86_Haswell-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-IBRS.xml
@@ -96,7 +96,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
index c8d050b8d3ccadab3b4ea941783d3fdc74d08a1e..f7bc81ba4d1711996d2f24a0a96e660f18be72ae 100644 (file)
--- a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
@@ -94,7 +94,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Haswell-noTSX.xml b/src/cpu_map/x86_Haswell-noTSX.xml
index d714ce58583d99ce65c89553e1776d3f03ae50d9..7d1791191717b71124a435339516cb457b3a9895 100644 (file)
--- a/src/cpu_map/x86_Haswell-noTSX.xml
+++ b/src/cpu_map/x86_Haswell-noTSX.xml
@@ -93,7 +93,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Haswell.xml b/src/cpu_map/x86_Haswell.xml
index 583649dbabf0abc853f54deb871683011005c6a9..b121e15d4d853a891a70f732ac7c804cef153dc6 100644 (file)
--- a/src/cpu_map/x86_Haswell.xml
+++ b/src/cpu_map/x86_Haswell.xml
@@ -95,7 +95,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml b/src/cpu_map/x86_Icelake-Server-noTSX.xml
index 8515b6518c711fa493a71440f564ef18dd1967d4..36596433cbb75ce8e78d315579bff6cf6b1eb404 100644 (file)
--- a/src/cpu_map/x86_Icelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml
@@ -121,7 +121,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-Server.xml
index 9d0cc254c02ae51f3b8255a8ce37f5aeb967f262..1e7ff355d5aa6ee9937752a71a7d646030c9a803 100644 (file)
--- a/src/cpu_map/x86_Icelake-Server.xml
+++ b/src/cpu_map/x86_Icelake-Server.xml
@@ -122,7 +122,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_IvyBridge-IBRS.xml b/src/cpu_map/x86_IvyBridge-IBRS.xml
index 4822b546e9085a9c3ea17aabb25a6075eaad957c..324152f85653ff90dda1aed467845799d1df1321 100644 (file)
--- a/src/cpu_map/x86_IvyBridge-IBRS.xml
+++ b/src/cpu_map/x86_IvyBridge-IBRS.xml
@@ -85,7 +85,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_IvyBridge.xml b/src/cpu_map/x86_IvyBridge.xml
index 93edca17ca8102a40ca7831cac9b034e7f54c36a..49d587afab5006633a9a0194364f1e6aae9e4eba 100644 (file)
--- a/src/cpu_map/x86_IvyBridge.xml
+++ b/src/cpu_map/x86_IvyBridge.xml
@@ -84,7 +84,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Nehalem-IBRS.xml b/src/cpu_map/x86_Nehalem-IBRS.xml
index a6510aa99f3faeed4ea773150c12b1af79aa6df7..ac05a349db1c04966152157ebeccb1e55edff0d1 100644 (file)
--- a/src/cpu_map/x86_Nehalem-IBRS.xml
+++ b/src/cpu_map/x86_Nehalem-IBRS.xml
@@ -74,7 +74,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Nehalem.xml b/src/cpu_map/x86_Nehalem.xml
index 6c0dfba45126342d33cc7e553fb25360bf5ff35f..74b85701e88d026953b0f95d5124a553b8a442ea 100644 (file)
--- a/src/cpu_map/x86_Nehalem.xml
+++ b/src/cpu_map/x86_Nehalem.xml
@@ -73,7 +73,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_SandyBridge-IBRS.xml b/src/cpu_map/x86_SandyBridge-IBRS.xml
index 6d2b5028eeca3a9cee3d92a89886630ddb0ac3cd..d2071f3367699a381ea4931addc96c7aca02c661 100644 (file)
--- a/src/cpu_map/x86_SandyBridge-IBRS.xml
+++ b/src/cpu_map/x86_SandyBridge-IBRS.xml
@@ -77,7 +77,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_SandyBridge.xml b/src/cpu_map/x86_SandyBridge.xml
index de3ad60e3dd8dca7592bee0288cef14c45003e02..c5d342e0d09026b8c915af809a61d03a5bfbcfc3 100644 (file)
--- a/src/cpu_map/x86_SandyBridge.xml
+++ b/src/cpu_map/x86_SandyBridge.xml
@@ -76,7 +76,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_SapphireRapids.xml b/src/cpu_map/x86_SapphireRapids.xml
index 6321dd36d9634112563e72a7b698b8057aef13b6..1e53b30dd376526e6367fafb072116fa61cf4a77 100644 (file)
--- a/src/cpu_map/x86_SapphireRapids.xml
+++ b/src/cpu_map/x86_SapphireRapids.xml
@@ -144,7 +144,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Skylake-Client-IBRS.xml b/src/cpu_map/x86_Skylake-Client-IBRS.xml
index 7d0d3c7114297b6661646078b458cfe6b18954ec..892aef2031eeb120df64b52ae863bc9dc9c2da88 100644 (file)
--- a/src/cpu_map/x86_Skylake-Client-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-IBRS.xml
@@ -105,7 +105,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
index 383270f5f99b2090b00533275906f5c60a6edbc5..63e5a0229643d4d1296f0bb1cc4262af606925cd 100644 (file)
--- a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
@@ -103,7 +103,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Skylake-Client.xml b/src/cpu_map/x86_Skylake-Client.xml
index 84789d642a1cf239c8c8261d9e8ca1c56f76a234..83cc6780c797fd9a72b4bb7f466ccf5c4e233f5b 100644 (file)
--- a/src/cpu_map/x86_Skylake-Client.xml
+++ b/src/cpu_map/x86_Skylake-Client.xml
@@ -104,7 +104,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Skylake-Server-IBRS.xml b/src/cpu_map/x86_Skylake-Server-IBRS.xml
index 8cd25a2df4dbeb8e5280a8b954f2a733214e0cbf..84f67c62780bfec625aa0a3b1b91f0aa9925409f 100644 (file)
--- a/src/cpu_map/x86_Skylake-Server-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-IBRS.xml
@@ -109,7 +109,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
index f3877bfbecc44d6ffe6c9ab36ed1010a885b3e0e..081e30f5ad200016f6d803adc133fdda75264ca7 100644 (file)
--- a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
@@ -108,7 +108,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-Server.xml
index 78bd727357c127eeecb4517bfc130ba2529deb88..e814b8dcf3f1d0a1b460f0fc1badb63de74d5a6e 100644 (file)
--- a/src/cpu_map/x86_Skylake-Server.xml
+++ b/src/cpu_map/x86_Skylake-Server.xml
@@ -108,7 +108,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Snowridge.xml b/src/cpu_map/x86_Snowridge.xml
index b31ce6f9f5a6808327907809f75a186dac8b5aba..b254c7d71e2935632685caf1dd6e5d5a0550c0d3 100644 (file)
--- a/src/cpu_map/x86_Snowridge.xml
+++ b/src/cpu_map/x86_Snowridge.xml
@@ -103,7 +103,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Westmere-IBRS.xml b/src/cpu_map/x86_Westmere-IBRS.xml
index 534c752ed9126b2dd9a20a658bec21ebc033f7e6..5d2fd81b8d9f7408c10816d8440486c80856868d 100644 (file)
--- a/src/cpu_map/x86_Westmere-IBRS.xml
+++ b/src/cpu_map/x86_Westmere-IBRS.xml
@@ -72,7 +72,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/cpu_map/x86_Westmere.xml b/src/cpu_map/x86_Westmere.xml
index 4edc5b383900a6bfa97bf25e48402dddb798a353..abbfb186b4e2f15caebef64e93ab1fb90d89d9b6 100644 (file)
--- a/src/cpu_map/x86_Westmere.xml
+++ b/src/cpu_map/x86_Westmere.xml
@@ -73,7 +73,6 @@
     <feature name='vmx-invvpid' added='yes'/>
     <feature name='vmx-invvpid-all-context' added='yes'/>
     <feature name='vmx-invvpid-single-addr' added='yes'/>
-    <feature name='vmx-invvpid-single-context' added='yes'/>
     <feature name='vmx-invvpid-single-context-noglobals' added='yes'/>
     <feature name='vmx-io-bitmap' added='yes'/>
     <feature name='vmx-io-exit' added='yes'/>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 45565326a5f0b1735a36df11cc6f50a47c3444e4..0d4f8a5fcd5f79c123b6b41ea967a432a02eb006 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3535,6 +3535,7 @@ const char *ignoredFeatures[] = {
     "cmt", "mbm_total", "mbm_local", /* never supported by QEMU */
     "osxsave", "ospke",              /* dropped from QEMU */
     "vmx-ept-uc", "vmx-ept-wb",      /* never supported by QEMU */
+    "vmx-invvpid-single-context",    /* never supported by QEMU */
 };
 
 bool