From beee33b1a42e47648b914d83a1de77d61a3fd300 Mon Sep 17 00:00:00 2001 From: Penny Zheng Date: Fri, 3 Apr 2020 16:23:13 +0800 Subject: [PATCH] configs: re-locate configs about linux guest support and optimization There exists a few configs about linux guest support or optimization that are not supported on aarch64. CONFIG_HYPERVISOR_GUEST is only defined under arch/x86/Kconfig and unfortunately, CONFIG_KVM_GUEST is not supported on aarch64 for now. Fixes: #1004 Signed-off-by: Penny Zheng --- kernel/configs/fragments/common/base.conf | 2 -- kernel/configs/fragments/x86_64/base.conf | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/configs/fragments/common/base.conf b/kernel/configs/fragments/common/base.conf index 76e37b8044..8bd72a0091 100644 --- a/kernel/configs/fragments/common/base.conf +++ b/kernel/configs/fragments/common/base.conf @@ -1,9 +1,7 @@ # Basic necessary items! CONFIG_SMP=y -CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT=y -CONFIG_KVM_GUEST=y # Note, no nested VM support enabled here # Turn off embedded mode, as it disabled 'too much', and we diff --git a/kernel/configs/fragments/x86_64/base.conf b/kernel/configs/fragments/x86_64/base.conf index c598074773..08023e8ca7 100644 --- a/kernel/configs/fragments/x86_64/base.conf +++ b/kernel/configs/fragments/x86_64/base.conf @@ -4,5 +4,9 @@ CONFIG_X86_MSR=y CONFIG_X86_X2APIC=y CONFIG_X86_VERBOSE_BOOTUP=y +# Configs around linux guest support and optimizations. +CONFIG_HYPERVISOR_GUEST=y +CONFIG_KVM_GUEST=y + # Use the maximum number of CPUs supported by KVM (240) CONFIG_NR_CPUS=240