x86: don't offer Hyper-V option when "PV Shim Exclusive"

This only added dead code. Use "if" instead of "depends on" to make
(halfway) clear that other guest options should also go in the same
block. Move the option down such that the shim related options get
presented first, avoiding to ask the question when the answer may end
up being discarded.

While in the neighborhood also bring PV_SHIM_EXCLUSIVE into more
"canonical" shape.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Wei Liu <wl@xen.org>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 0a02b6ee3fd1879a39472cfbb8b3d11db2aedf59..02bb05f42ef13f793d915e5479b435764f4e8ac2 100644 (file)
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -164,14 +164,6 @@ endchoice
 config GUEST
        bool
 
-config HYPERV_GUEST
-       bool "Hyper-V Guest"
-       select GUEST
-       ---help---
-         Support for Xen detecting when it is running under Hyper-V.
-
-         If unsure, say N.
-
 config XEN_GUEST
        bool "Xen Guest"
        select GUEST
@@ -201,8 +193,7 @@ config PV_SHIM
          If unsure, say Y.
 
 config PV_SHIM_EXCLUSIVE
-       def_bool n
-       prompt "PV Shim Exclusive"
+       bool "PV Shim Exclusive"
        depends on PV_SHIM
        ---help---
          Build Xen in a way which unconditionally assumes PV_SHIM mode.  This
@@ -211,6 +202,18 @@ config PV_SHIM_EXCLUSIVE
 
          If unsure, say N.
 
+if !PV_SHIM_EXCLUSIVE
+
+config HYPERV_GUEST
+       bool "Hyper-V Guest"
+       select GUEST
+       ---help---
+         Support for Xen detecting when it is running under Hyper-V.
+
+         If unsure, say N.
+
+endif
+
 config MEM_SHARING
        bool "Xen memory sharing support" if EXPERT = "y"
        depends on HVM