[xen master] x86/shim: don't permit HVM and PV_SHIM_EXCLUSIVE at the same time

[patchbot@xxxxxxx]

commit 075926410e997cc564c6b6ac6ddf17bc5459b445
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue May 4 10:49:22 2021 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue May 4 10:49:22 2021 +0200

    x86/shim: don't permit HVM and PV_SHIM_EXCLUSIVE at the same time
    
    This combination doesn't really make sense (and there likely are more);
    in particular even if the code built with both options set, HVM guests
    wouldn't work (and I think one wouldn't be able to create one in the
    first place). The alternative here would be some presumably intrusive
    #ifdef-ary to get this combination to actually build (but still not
    work) again.
    
    Fixes: 8b5b49ceb3d9 ("x86: don't include domctl and alike in shim-exclusive 
builds")
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
 xen/arch/x86/Kconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 271b098fb5..e55e029b79 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -22,7 +22,7 @@ config X86
        select HAS_PDX
        select HAS_SCHED_GRANULARITY
        select HAS_UBSAN
-       select HAS_VPCI if !PV_SHIM_EXCLUSIVE && HVM
+       select HAS_VPCI if HVM
        select NEEDS_LIBELF
        select NUMA
 
@@ -90,11 +90,12 @@ config PV_LINEAR_PT
          If unsure, say Y.
 
 config HVM
-       def_bool !PV_SHIM_EXCLUSIVE
+       bool "HVM support"
+       depends on !PV_SHIM_EXCLUSIVE
+       default !PV_SHIM
        select COMPAT
        select IOREQ_SERVER
        select MEM_ACCESS_ALWAYS_ON
-       prompt "HVM support"
        ---help---
          Interfaces to support HVM domains.  HVM domains require hardware
          virtualisation extensions (e.g. Intel VT-x, AMD SVM), but can boot
--
generated by git-patchbot for /home/xen/git/xen.git#master