{
kvm_set_cpu_caps();
- /* CPUID 0x80000001 */
- if (nested)
+ /* CPUID 0x80000001 and 0x8000000A (SVM features) */
+ if (nested) {
kvm_cpu_cap_set(X86_FEATURE_SVM);
+ if (boot_cpu_has(X86_FEATURE_NRIPS))
+ kvm_cpu_cap_set(X86_FEATURE_NRIPS);
+
+ if (npt_enabled)
+ kvm_cpu_cap_set(X86_FEATURE_NPT);
+ }
+
/* CPUID 0x80000008 */
if (boot_cpu_has(X86_FEATURE_LS_CFG_SSBD) ||
boot_cpu_has(X86_FEATURE_AMD_SSBD))
kvm_cpu_cap_set(X86_FEATURE_VIRT_SSBD);
-
- /* CPUID 0x8000000A */
- /* Support next_rip if host supports it */
- kvm_cpu_cap_check_and_set(X86_FEATURE_NRIPS);
-
- if (npt_enabled)
- kvm_cpu_cap_set(X86_FEATURE_NPT);
}
static __init int svm_hardware_setup(void)
{
switch (entry->function) {
case 0x8000000A:
+ if (!kvm_cpu_cap_has(X86_FEATURE_SVM)) {
+ entry->eax = entry->ebx = entry->ecx = entry->edx = 0;
+ break;
+ }
entry->eax = 1; /* SVM revision 1 */
entry->ebx = 8; /* Lets support 8 ASIDs in case we add proper
ASID emulation to nested SVM */