Remove all "depends on !PV_SHIM_EXCLUSIVE" (also the functionally equivalent "if !...") in Kconfig file, since negative dependancy will badly affect allyesconfig. To make sure unchanging produced config file based on "pvshim_defconfig", we shall explicitly state according Kconfig is not set
Add "default y" for SHADOW_PAGING and TBOOT, otherwise we will have unset values when running make defconfig based on "x86_64_defconfig". Signed-off-by: Penny Zheng <[email protected]> --- v2 -> v3: - remove comment for PV_SHIM_EXCLUSIVE --- v3 -> v4: - explicitly state "CONFIG_xxx is not set" in "pvshim_defconfig" - Add "default y" for SHADOW_PAGING and TBOOT - refactor commit message --- xen/arch/x86/Kconfig | 6 ++---- xen/arch/x86/configs/pvshim_defconfig | 5 +++++ xen/arch/x86/hvm/Kconfig | 1 - xen/drivers/video/Kconfig | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 7afe879710..8c8e661d53 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -143,7 +143,7 @@ config XEN_IBT config SHADOW_PAGING bool "Shadow Paging" - default !PV_SHIM_EXCLUSIVE + default y depends on PV || HVM help @@ -175,7 +175,7 @@ config BIGMEM config TBOOT bool "Xen tboot support (UNSUPPORTED)" depends on INTEL && UNSUPPORTED - default !PV_SHIM_EXCLUSIVE + default y select CRYPTO help Allows support for Trusted Boot using the Intel(R) Trusted Execution @@ -288,7 +288,6 @@ config PV_SHIM_EXCLUSIVE If unsure, say N. -if !PV_SHIM_EXCLUSIVE config HYPERV_GUEST bool "Hyper-V Guest" @@ -298,7 +297,6 @@ config HYPERV_GUEST If unsure, say N. -endif config REQUIRE_NX bool "Require NX (No eXecute) support" diff --git a/xen/arch/x86/configs/pvshim_defconfig b/xen/arch/x86/configs/pvshim_defconfig index 2ad27f898e..6f652e145e 100644 --- a/xen/arch/x86/configs/pvshim_defconfig +++ b/xen/arch/x86/configs/pvshim_defconfig @@ -26,3 +26,8 @@ CONFIG_EXPERT=y # CONFIG_INTEL_IOMMU is not set # CONFIG_DEBUG is not set # CONFIG_GDBSX is not set +# CONFIG_SHADOW_PAGING is not set +# CONFIG_TBOOT is not set +# HYPERV_HYPERV_GUEST is not set +# CONFIG_HVM is not set +# CONFIG_VGA is not set diff --git a/xen/arch/x86/hvm/Kconfig b/xen/arch/x86/hvm/Kconfig index 2def0f98e2..b903764bda 100644 --- a/xen/arch/x86/hvm/Kconfig +++ b/xen/arch/x86/hvm/Kconfig @@ -1,6 +1,5 @@ menuconfig HVM bool "HVM support" - depends on !PV_SHIM_EXCLUSIVE default !PV_SHIM select COMPAT select IOREQ_SERVER diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig index 245030beea..66ee1e7c9c 100644 --- a/xen/drivers/video/Kconfig +++ b/xen/drivers/video/Kconfig @@ -3,10 +3,10 @@ config VIDEO bool config VGA - bool "VGA support" if !PV_SHIM_EXCLUSIVE + bool "VGA support" select VIDEO depends on X86 - default y if !PV_SHIM_EXCLUSIVE + default y help Enable VGA output for the Xen hypervisor. -- 2.34.1
