xen: Kconfig: nest Xen guest options

Moving XEN_512GB allows it to nest under XEN_PV.  That also allows
XEN_PVH to nest under XEN as a sibling to XEN_PV and XEN_PVHVM giving:

[*]   Xen guest support
[*]     Xen PV guest support
[*]       Limit Xen pv-domain memory to 512GB
[*]       Xen PV Dom0 support
[*]     Xen PVHVM guest support
[*]     Xen PVH guest support

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20201014175342.152712-3-jandryuk@gmail.com
Signed-off-by: Juergen Gross <jgross@suse.com>

diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index b75007eb4ec4b0fcb7fafd1aa1ab82fdd8be27c1..2b105888927c45eb180e7c75df4abfc1bd180de7 100644 (file)
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -26,6 +26,19 @@ config XEN_PV
        help
          Support running as a Xen PV guest.
 
+config XEN_512GB
+       bool "Limit Xen pv-domain memory to 512GB"
+       depends on XEN_PV && X86_64
+       default y
+       help
+         Limit paravirtualized user domains to 512GB of RAM.
+
+         The Xen tools and crash dump analysis tools might not support
+         pv-domains with more than 512 GB of RAM. This option controls the
+         default setting of the kernel to use only up to 512 GB or more.
+         It is always possible to change the default via specifying the
+         boot parameter "xen_512gb_limit".
+
 config XEN_PV_SMP
        def_bool y
        depends on XEN_PV && SMP
@@ -53,19 +66,6 @@ config XEN_PVHVM_GUEST
        help
          Support running as a Xen PVHVM guest.
 
-config XEN_512GB
-       bool "Limit Xen pv-domain memory to 512GB"
-       depends on XEN_PV
-       default y
-       help
-         Limit paravirtualized user domains to 512GB of RAM.
-
-         The Xen tools and crash dump analysis tools might not support
-         pv-domains with more than 512 GB of RAM. This option controls the
-         default setting of the kernel to use only up to 512 GB or more.
-         It is always possible to change the default via specifying the
-         boot parameter "xen_512gb_limit".
-
 config XEN_SAVE_RESTORE
        bool
        depends on XEN