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

[Jan Beulich <jbeulich@xxxxxxxx>]

This combination doesn't really make sense (and there likely are more).
The alternative here would be some presumably intrusive #ifdef-ary to
get this combination to actually build again.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>

--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -23,7 +23,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,8 +90,8 @@ config PV_LINEAR_PT
          If unsure, say Y.
 
 config HVM
-       def_bool !PV_SHIM_EXCLUSIVE
-       prompt "HVM support"
+       bool "HVM support"
+       depends on !PV_SHIM_EXCLUSIVE
        ---help---
          Interfaces to support HVM domains.  HVM domains require hardware
          virtualisation extensions (e.g. Intel VT-x, AMD SVM), but can boot