[Minios-devel] [UNIKRAFT PATCH] plat/xen: Revisit configuration options for PV

[Costin Lupu <costin.lupu@xxxxxxxxx>]

This patch tries to fix a few things about the PV configuration:
* First off, we introduce the hidden XEN_PV option.
* Next, XEN_PV_BUILD_P2M is used only for PV images on x86_64.
* Grants might be used for ARM as well (at least that's what minios does).
But for PV images we enable them by default because we cannot do much
without it.
* Xenbus communication needs grants support, so it depends on them. We also
enable it by default for PV for the same reason we enable grants.
* In case of Xenbus drivers, it's enough to depend on Xenbus support.

Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
---
 plat/xen/Config.uk | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/plat/xen/Config.uk b/plat/xen/Config.uk
index 366ab344..364c9528 100644
--- a/plat/xen/Config.uk
+++ b/plat/xen/Config.uk
@@ -19,6 +19,11 @@ config XEN_HVMLITE
        default n if (ARCH_X86_64 || ARCH_X86_32)
        default y
 
+config XEN_PV
+       bool
+       default n if XEN_HVMLITE
+       default y
+
 menu "Console Options"
 
 config XEN_KERNEL_HV_CONSOLE
@@ -52,6 +57,7 @@ endmenu
 
 config XEN_PV_BUILD_P2M
        bool "Create p2m table"
+       depends on (ARCH_X86_64 && XEN_PV)
        default n
        help
                Create and initialize physical to machine (p2m) table on a PV
@@ -59,7 +65,8 @@ config XEN_PV_BUILD_P2M
 
 config XEN_GNTTAB
        bool "Grant table support"
-       default y
+       default y if XEN_PV
+       default n
        depends on (ARCH_X86_64)
        select LIBUKALLOC
        select LIBUKLOCK
@@ -70,8 +77,9 @@ config XEN_GNTTAB
 
 config XEN_XENBUS
        bool "Xenbus/XenStore driver"
+       default y if XEN_PV
        default n
-       depends on (ARCH_X86_64)
+       depends on XEN_GNTTAB
        select LIBUKALLOC
        select LIBUKSCHED
        select LIBUKBUS
@@ -80,8 +88,7 @@ config XEN_XENBUS
                XenStore communication API for Xen drivers
 
 menu "Xenbus Drivers"
-        depends on XEN_XENBUS
-        depends on XEN_GNTTAB
+       depends on XEN_XENBUS
 
 menuconfig XEN_BLKFRONT
        bool "Xenbus Blkfront Driver"
-- 
2.20.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel