diff --git a/src/cpu_map/sync_qemu_features_i386.py b/src/cpu_map/sync_qemu_features_i386.py
index c78c0b2ac9..15a7af85cb 100755
--- 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 408e07911e..65ae031223 100755
--- 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 e87f54a102..4845931420 100644
--- 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 59c2c08937..b1e7aa5d5e 100644
--- 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 b9b25d6b6c..24aa6a37bd 100644
--- 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 2845a620ac..1b27489db2 100644
--- 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 a3b332c9c1..d1d49fdd58 100644
--- 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 9faad320e6..09840ce52f 100644
--- 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 caccfc048c..8f37df60de 100644
--- 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 6dab7d7b09..9a94476459 100644
--- 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 e2e3ce6b51..0fed6fbb78 100644
--- 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 c8d050b8d3..f7bc81ba4d 100644
--- 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 d714ce5858..7d17911917 100644
--- 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 583649dbab..b121e15d4d 100644
--- 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 8515b6518c..36596433cb 100644
--- 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 9d0cc254c0..1e7ff355d5 100644
--- 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 4822b546e9..324152f856 100644
--- 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 93edca17ca..49d587afab 100644
--- 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 a6510aa99f..ac05a349db 100644
--- 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 6c0dfba451..74b85701e8 100644
--- 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 6d2b5028ee..d2071f3367 100644
--- 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 de3ad60e3d..c5d342e0d0 100644
--- 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 6321dd36d9..1e53b30dd3 100644
--- 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 7d0d3c7114..892aef2031 100644
--- 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 383270f5f9..63e5a02296 100644
--- 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 84789d642a..83cc6780c7 100644
--- 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 8cd25a2df4..84f67c6278 100644
--- 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 f3877bfbec..081e30f5ad 100644
--- 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 78bd727357..e814b8dcf3 100644
--- 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 b31ce6f9f5..b254c7d71e 100644
--- 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 534c752ed9..5d2fd81b8d 100644
--- 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 4edc5b3839..abbfb186b4 100644
--- 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 45565326a5..0d4f8a5fcd 100644
--- 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