[xen staging] x86/shim: adjust Kconfig defaults

[patchbot@xxxxxxx]

commit 22b08b35db4aca2d2f6b31ba940cc65402b5586d
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Oct 2 08:35:31 2020 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Oct 2 08:35:31 2020 +0200

    x86/shim: adjust Kconfig defaults
    
    Just like HVM, defaulting SHADOW_PAGING and TBOOT to Yes in shim-
    exclusive mode makes no sense, as the respective code is dead there.
    
    Also adjust the shim default config file: It needs to specifiy values
    only for settings where a non-default value is wanted.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
 xen/arch/x86/Kconfig                  | 10 +++++-----
 xen/arch/x86/configs/pvshim_defconfig |  3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index a636a4bb1e..24868aa6ad 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -116,9 +116,9 @@ config XEN_SHSTK
          compatiblity can be provided via the PV Shim mechanism.
 
 config SHADOW_PAGING
-        bool "Shadow Paging"
-        default y
-        ---help---
+       bool "Shadow Paging"
+       default !PV_SHIM_EXCLUSIVE
+       ---help---
 
           Shadow paging is a software alternative to hardware paging support
           (Intel EPT, AMD NPT).
@@ -165,8 +165,8 @@ config HVM_FEP
          If unsure, say N.
 
 config TBOOT
-       def_bool y
-       prompt "Xen tboot support" if EXPERT
+       bool "Xen tboot support" if EXPERT
+       default y if !PV_SHIM_EXCLUSIVE
        select CRYPTO
        ---help---
          Allows support for Trusted Boot using the Intel(R) Trusted Execution
diff --git a/xen/arch/x86/configs/pvshim_defconfig 
b/xen/arch/x86/configs/pvshim_defconfig
index 3af48d6c06..5478b991ac 100644
--- a/xen/arch/x86/configs/pvshim_defconfig
+++ b/xen/arch/x86/configs/pvshim_defconfig
@@ -8,12 +8,9 @@ CONFIG_NR_CPUS=32
 CONFIG_EXPERT=y
 CONFIG_SCHED_NULL=y
 # Disable features not used by the PV shim
-# CONFIG_HVM is not set
 # CONFIG_XEN_SHSTK is not set
 # CONFIG_HYPFS is not set
-# CONFIG_SHADOW_PAGING is not set
 # CONFIG_BIGMEM is not set
-# CONFIG_TBOOT is not set
 # CONFIG_KEXEC is not set
 # CONFIG_XENOPROF is not set
 # CONFIG_XSM is not set
--
generated by git-patchbot for /home/xen/git/xen.git#staging