We intend to remove all "depends on !PV_SHIM_EXCLUSIVE" (also the functionally equivalent "if !...") in Kconfig file, since negative dependancy will badly affect allyesconfig. This commit is based on "x86: provide an inverted Kconfig control for shim-exclusive mode"[1]
[1] https://lists.xen.org/archives/html/xen-devel/2023-03/msg00040.html Signed-off-by: Jan Beulich <jbeul...@suse.com> Signed-off-by: Penny Zheng <penny.zh...@amd.com> --- xen/arch/x86/Kconfig | 6 ++---- xen/arch/x86/hvm/Kconfig | 1 - xen/drivers/video/Kconfig | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 18efdb2e31..1e5df84b25 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -137,7 +137,6 @@ config XEN_IBT config SHADOW_PAGING bool "Shadow Paging" - default !PV_SHIM_EXCLUSIVE depends on PV || HVM help @@ -169,7 +168,6 @@ config BIGMEM config TBOOT bool "Xen tboot support (UNSUPPORTED)" depends on INTEL && UNSUPPORTED - default !PV_SHIM_EXCLUSIVE select CRYPTO help Allows support for Trusted Boot using the Intel(R) Trusted Execution @@ -279,10 +277,11 @@ config PV_SHIM_EXCLUSIVE Build Xen in a way which unconditionally assumes PV_SHIM mode. This option is only intended for use when building a dedicated PV Shim firmware, and will not function correctly in other scenarios. + Features, like tboot, shadow page, VGA, HVM, Hyper-V Guest, etc, + are unavailable in shim-exclusive mode. If unsure, say N. -if !PV_SHIM_EXCLUSIVE config HYPERV_GUEST bool "Hyper-V Guest" @@ -292,7 +291,6 @@ config HYPERV_GUEST If unsure, say N. -endif config REQUIRE_NX bool "Require NX (No eXecute) support" 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
