From: Jan Beulich Date: Tue, 4 May 2021 08:49:22 +0000 (+0200) Subject: x86/shim: don't permit HVM and PV_SHIM_EXCLUSIVE at the same time X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~570 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=075926410e997cc564c6b6ac6ddf17bc5459b445;p=xen.git 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 Acked-by: Roger Pau Monné --- 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