External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 03:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jiri Denemark 2024-10-08 12:26:46 +02:00
parent b1d4196580
commit 93d97d8fa2
33 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cpu_map/sync_qemu_features_i386.py
View File

@ -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
}
}

2
src/cpu_map/sync_qemu_models_i386.py
View File

@ -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:

1
src/cpu_map/x86_Broadwell-IBRS.xml
View File

@ -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'/>

1
src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
View File

@ -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'/>

1
src/cpu_map/x86_Broadwell-noTSX.xml
View File

@ -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'/>

1
src/cpu_map/x86_Broadwell.xml
View File

@ -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'/>

1
src/cpu_map/x86_Cascadelake-Server-noTSX.xml
View File

@ -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'/>

1
src/cpu_map/x86_Cascadelake-Server.xml
View File

@ -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'/>

1
src/cpu_map/x86_Cooperlake.xml
View File

@ -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'/>

1
src/cpu_map/x86_GraniteRapids.xml
View File

@ -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'/>

1
src/cpu_map/x86_Haswell-IBRS.xml
View File

@ -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'/>

1
src/cpu_map/x86_Haswell-noTSX-IBRS.xml
View File

@ -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'/>

1
src/cpu_map/x86_Haswell-noTSX.xml
View File

@ -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'/>

1
src/cpu_map/x86_Haswell.xml
View File

@ -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'/>

1
src/cpu_map/x86_Icelake-Server-noTSX.xml
View File

@ -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'/>

1
src/cpu_map/x86_Icelake-Server.xml
View File

@ -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'/>

1
src/cpu_map/x86_IvyBridge-IBRS.xml
View File

@ -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'/>

1
src/cpu_map/x86_IvyBridge.xml
View File

@ -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'/>

1
src/cpu_map/x86_Nehalem-IBRS.xml
View File

@ -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'/>

1
src/cpu_map/x86_Nehalem.xml
View File

@ -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'/>

1
src/cpu_map/x86_SandyBridge-IBRS.xml
View File

@ -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'/>

1
src/cpu_map/x86_SandyBridge.xml
View File

@ -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'/>

1
src/cpu_map/x86_SapphireRapids.xml
View File

@ -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'/>

1
src/cpu_map/x86_Skylake-Client-IBRS.xml
View File

@ -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'/>

1
src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
View File

@ -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'/>

1
src/cpu_map/x86_Skylake-Client.xml
View File

@ -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'/>

1
src/cpu_map/x86_Skylake-Server-IBRS.xml
View File

@ -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'/>

1
src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
View File

@ -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'/>

1
src/cpu_map/x86_Skylake-Server.xml
View File

@ -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'/>

1
src/cpu_map/x86_Snowridge.xml
View File

@ -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'/>

1
src/cpu_map/x86_Westmere-IBRS.xml
View File

@ -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'/>

1
src/cpu_map/x86_Westmere.xml
View File

@ -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'/>

1
src/qemu/qemu_capabilities.c
View File

@ -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