From: Julien Grall Date: Thu, 30 Apr 2020 14:25:47 +0000 (+0100) Subject: xen/Kconfig: define EXPERT a bool rather than a string X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~272 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f8644fe441abfd8de8b1f237229cfbe600a58701;p=xen.git xen/Kconfig: define EXPERT a bool rather than a string Since commit f80fe2b34f08 "xen: Update Kconfig to Linux v5.4" EXPERT can only have two values (enabled or disabled). So switch from a string to a bool. Take the opportunity to replace all "EXPERT = y" to "EXPERT" and use squash the lines bool and prompt together in modified place. Signed-off-by: Julien Grall Acked-by: Dario Faggioli Acked-by: Stefano Stabellini Acked-by: Jan Beulich --- diff --git a/xen/Kconfig b/xen/Kconfig index 073042f467..120b5f4129 100644 --- a/xen/Kconfig +++ b/xen/Kconfig @@ -35,8 +35,7 @@ config DEFCONFIG_LIST default ARCH_DEFCONFIG config EXPERT - string - default y if "$(XEN_CONFIG_EXPERT)" = "y" + def_bool y if "$(XEN_CONFIG_EXPERT)" = "y" config LTO bool "Link Time Optimisation" diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index ee6ee33b69..fad3050d4f 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -11,7 +11,7 @@ config DEBUG You probably want to say 'N' here. -if DEBUG || EXPERT = "y" +if DEBUG || EXPERT config CRASH_DEBUG bool "Crash Debugging Support" diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index d51f66072e..2777388265 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -32,8 +32,7 @@ menu "Architecture Features" source "arch/Kconfig" config ACPI - bool - prompt "ACPI (Advanced Configuration and Power Interface) Support" if EXPERT = "y" + bool "ACPI (Advanced Configuration and Power Interface) Support" if EXPERT depends on ARM_64 ---help--- @@ -50,8 +49,7 @@ config GICV3 If unsure, say Y config HAS_ITS - bool - prompt "GICv3 ITS MSI controller support" if EXPERT = "y" + bool "GICv3 ITS MSI controller support" if EXPERT depends on GICV3 && !NEW_VGIC config HVM @@ -81,7 +79,7 @@ config SBSA_VUART_CONSOLE SBSA Generic UART implements a subset of ARM PL011 UART. config ARM_SSBD - bool "Speculative Store Bypass Disable" if EXPERT = "y" + bool "Speculative Store Bypass Disable" if EXPERT depends on HAS_ALTERNATIVE default y help @@ -91,7 +89,7 @@ config ARM_SSBD If unsure, say Y. config HARDEN_BRANCH_PREDICTOR - bool "Harden the branch predictor against aliasing attacks" if EXPERT = "y" + bool "Harden the branch predictor against aliasing attacks" if EXPERT default y help Speculation attacks against some high-performance processors rely on @@ -108,7 +106,7 @@ config HARDEN_BRANCH_PREDICTOR If unsure, say Y. config TEE - bool "Enable TEE mediators support" if EXPERT = "y" + bool "Enable TEE mediators support" if EXPERT default n help This option enables generic TEE mediators support. It allows guests diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 96432f1f69..b565f6831d 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -128,7 +128,7 @@ config BIGMEM If unsure, say N. config HVM_FEP - bool "HVM Forced Emulation Prefix support" if EXPERT = "y" + bool "HVM Forced Emulation Prefix support" if EXPERT default DEBUG depends on HVM ---help--- @@ -148,7 +148,7 @@ config HVM_FEP config TBOOT def_bool y - prompt "Xen tboot support" if EXPERT = "y" + prompt "Xen tboot support" if EXPERT select CRYPTO ---help--- Allows support for Trusted Boot using the Intel(R) Trusted Execution @@ -233,7 +233,7 @@ config HYPERV_GUEST endif config MEM_SHARING - bool "Xen memory sharing support" if EXPERT = "y" + bool "Xen memory sharing support" if EXPERT depends on HVM endmenu diff --git a/xen/common/Kconfig b/xen/common/Kconfig index a6914fcae9..fe9b41f721 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -12,7 +12,7 @@ config CORE_PARKING bool config GRANT_TABLE - bool "Grant table support" if EXPERT = "y" + bool "Grant table support" if EXPERT default y ---help--- Grant table provides a generic mechanism to memory sharing @@ -128,7 +128,7 @@ config KEXEC If unsure, say Y. config EFI_SET_VIRTUAL_ADDRESS_MAP - bool "EFI: call SetVirtualAddressMap()" if EXPERT = "y" + bool "EFI: call SetVirtualAddressMap()" if EXPERT ---help--- Call EFI SetVirtualAddressMap() runtime service to setup memory map for further runtime services. According to UEFI spec, it isn't strictly @@ -139,7 +139,7 @@ config EFI_SET_VIRTUAL_ADDRESS_MAP config XENOPROF def_bool y - prompt "Xen Oprofile Support" if EXPERT = "y" + prompt "Xen Oprofile Support" if EXPERT depends on X86 ---help--- Xen OProfile (Xenoprof) is a system-wide profiler for Xen virtual @@ -176,7 +176,7 @@ config XSM_FLASK config XSM_FLASK_AVC_STATS def_bool y - prompt "Maintain statistics on the FLASK access vector cache" if EXPERT = "y" + prompt "Maintain statistics on the FLASK access vector cache" if EXPERT depends on XSM_FLASK ---help--- Maintain counters on the access vector cache that can be viewed using @@ -249,7 +249,7 @@ config LATE_HWDOM If unsure, say N. config ARGO - bool "Argo: hypervisor-mediated interdomain communication" if EXPERT = "y" + bool "Argo: hypervisor-mediated interdomain communication" if EXPERT ---help--- Enables a hypercall for domains to ask the hypervisor to perform data transfer of messages between domains. @@ -321,7 +321,7 @@ config SUPPRESS_DUPLICATE_SYMBOL_WARNINGS build becoming overly verbose. config CMDLINE - string "Built-in hypervisor command string" if EXPERT = "y" + string "Built-in hypervisor command string" if EXPERT default "" ---help--- Enter arguments here that should be compiled into the hypervisor @@ -354,7 +354,7 @@ config DOM0_MEM Leave empty if you are not sure what to specify. config TRACEBUFFER - bool "Enable tracing infrastructure" if EXPERT = "y" + bool "Enable tracing infrastructure" if EXPERT default y ---help--- Enable tracing infrastructure and pre-defined tracepoints within Xen. diff --git a/xen/common/sched/Kconfig b/xen/common/sched/Kconfig index 883ac87cab..61231aacaa 100644 --- a/xen/common/sched/Kconfig +++ b/xen/common/sched/Kconfig @@ -1,5 +1,5 @@ menu "Schedulers" - visible if EXPERT = "y" + visible if EXPERT config SCHED_CREDIT bool "Credit scheduler support" diff --git a/xen/drivers/passthrough/Kconfig b/xen/drivers/passthrough/Kconfig index e7e62ccd63..73f4ad89ec 100644 --- a/xen/drivers/passthrough/Kconfig +++ b/xen/drivers/passthrough/Kconfig @@ -14,7 +14,7 @@ config ARM_SMMU ARM SMMU architecture. config IPMMU_VMSA - bool "Renesas IPMMU-VMSA found in R-Car Gen3 SoCs" if EXPERT = "y" + bool "Renesas IPMMU-VMSA found in R-Car Gen3 SoCs" if EXPERT depends on ARM_64 ---help--- Support for implementations of the Renesas IPMMU-VMSA found