Commit c1de0f25 authored by Peter Gonda's avatar Peter Gonda Committed by Paolo Bonzini
Browse files

KVM x86: Move kvm cpuid support out of svm 



Memory encryption support does not have module parameter dependencies
and can be moved into the general x86 cpuid __do_cpuid_ent function.
This changes maintains current behavior of passing through all of
CPUID.8000001F.

Suggested-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarPeter Gonda <pgonda@google.com>
Reviewed-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 96710247

arch/x86/kvm/cpuid.c

+5 −0
Original line number Diff line number Diff line
@@ -778,6 +778,11 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, 
	case 0x8000001a:

	case 0x8000001e:

		break;

	/* Support memory encryption cpuid if host supports it */

	case 0x8000001F:

		if (!boot_cpu_has(X86_FEATURE_SEV))

			entry->eax = entry->ebx = entry->ecx = entry->edx = 0;

		break;

	/*Add support for Centaur's CPUID instruction*/

	case 0xC0000000:

		/*Just support up to 0xC0000004 now*/

arch/x86/kvm/svm.c

+0 −7
Original line number Diff line number Diff line
@@ -5958,13 +5958,6 @@ static void svm_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry) 
		if (npt_enabled)

			entry->edx |= F(NPT);



		break;

	case 0x8000001F:

		/* Support memory encryption cpuid if host supports it */

		if (boot_cpu_has(X86_FEATURE_SEV))

			cpuid(0x8000001f, &entry->eax, &entry->ebx,

				&entry->ecx, &entry->edx);



	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE