plat/xen: Introduce `HAVE_XENBUS`

This commit introduces `HAVE_XENBUS` as replacement for `PLAT_XEN`. This
prepares the Xen drivers for potential re-use by platforms that implement
devices by the Xen standard.

Signed-off-by: Simon Kuenzer <simon@unikraft.io>
Reviewed-by: Oleksii Moisieiev <oleksii_moisieiev@epam.com>
Reviewed-by: Oleksii Moisieiev <oleksii_moisieiev@epam.com>
Reviewed-by: Michalis Pappas <michalis@unikraft.io>
Approved-by: Michalis Pappas <michalis@unikraft.io>
GitHub-Closes: #1501

diff --git a/drivers/xen/9pfront/Config.uk b/drivers/xen/9pfront/Config.uk
index 40ea67a35e9265ab0cf580a0cf896f1ec8d413b8..0ffa3bbc6f3520a4e14f1d7b6a4b07dd02ae1d0e 100644 (file)
--- a/drivers/xen/9pfront/Config.uk
+++ b/drivers/xen/9pfront/Config.uk
@@ -2,7 +2,7 @@ menuconfig LIB9PFRONT
        bool "9pfront: Xen 9pfs volumes"
        select LIBXENBUS
        select LIBXENHEADERS
-       depends on PLAT_XEN
+       depends on HAVE_XENBUS
        depends on LIBUK9P
        help
                Xen driver for 9pfs volumes

diff --git a/drivers/xen/blkfront/Config.uk b/drivers/xen/blkfront/Config.uk
index 459d02319fd31bc6490cda059e1e7565201193de..2b2f6ba69b5fb8024295c1302d3a9d66ed28018a 100644 (file)
--- a/drivers/xen/blkfront/Config.uk
+++ b/drivers/xen/blkfront/Config.uk
@@ -2,7 +2,7 @@ menuconfig LIBBLKFRONT
        bool "blkfront: Xen block devices"
        select LIBXENHEADERS
        select LIBXENBUS
-       depends on PLAT_XEN
+       depends on HAVE_XENBUS
        depends on LIBUKBLKDEV
        help
                Xen driver for block devices

diff --git a/drivers/xen/netfront/Config.uk b/drivers/xen/netfront/Config.uk
index 4ef99adacc8806ebd163b88a34f14c25bd0aa21a..2323bfb458242bd9cfab370f0acde794f446b463 100644 (file)
--- a/drivers/xen/netfront/Config.uk
+++ b/drivers/xen/netfront/Config.uk
@@ -3,7 +3,7 @@ config LIBNETFRONT
        select LIBXENHEADERS
        select LIBXENBUS
        depends on XEN_GNTTAB
-       depends on PLAT_XEN
+       depends on HAVE_XENBUS
        depends on LIBUKNETDEV
        help
                Driver for netfront devices

diff --git a/drivers/xen/xenbus/Config.uk b/drivers/xen/xenbus/Config.uk
index 354e3ea4f81ab0d4b68e20fe57faf1662831bb60..2cba85c3a13d9bd878138367550def09d6c91a7c 100644 (file)
--- a/drivers/xen/xenbus/Config.uk
+++ b/drivers/xen/xenbus/Config.uk
@@ -1,6 +1,9 @@
+config HAVE_XENBUS
+       bool
+
 config LIBXENBUS
        bool "xenbus: Xenbus/XenStore"
-       depends on PLAT_XEN
+       depends on HAVE_XENBUS
        select LIBXENHEADERS
        select LIBUKALLOC
        select LIBUKSCHED

diff --git a/drivers/xen/xencons/Config.uk b/drivers/xen/xencons/Config.uk
index e0d8f7f524d6f7ad3474e0580ef67cbb213a65c9..9de3254639d5ce805a3d09b0cb9a61ad5e24c31b 100644 (file)
--- a/drivers/xen/xencons/Config.uk
+++ b/drivers/xen/xencons/Config.uk
@@ -2,7 +2,7 @@ config LIBXENCONS
        bool "xencons: Xen hypervisor console"
        select LIBXENHEADERS
        select LIBNOLIBC if !HAVE_LIBC
+       depends on HAVE_XENBUS
        depends on LIBUKCONSOLE
-       depends on PLAT_XEN
        help
                Driver for the Xen hypervisor console

diff --git a/drivers/xen/xenemgcons/Config.uk b/drivers/xen/xenemgcons/Config.uk
index 2e3f957729042b5af9d8d62a56a1d0a8ebcb0cfc..bd861f1f1469dd826a42747b14b0df4e057de62c 100644 (file)
--- a/drivers/xen/xenemgcons/Config.uk
+++ b/drivers/xen/xenemgcons/Config.uk
@@ -2,7 +2,6 @@ config LIBXENEMGCONS
        bool "xenemgcons: Xen emergency console"
        select LIBXENHEADERS
        depends on LIBUKCONSOLE
-       depends on PLAT_XEN
        help
                Driver for the Xen emergency console. This console is
                based on a single hypercall.

diff --git a/plat/xen/Config.uk b/plat/xen/Config.uk
index 859d0ed507eb275a5789888721d5a023591c1869..84aa30a6fd8e8972334ab7ee21a058d08d6a1c47 100644 (file)
--- a/plat/xen/Config.uk
+++ b/plat/xen/Config.uk
@@ -4,6 +4,7 @@ menuconfig PLAT_XEN
        depends on ((ARCH_X86_32 && !HAVE_SMP) || (ARCH_X86_64 && !HAVE_SMP) || (ARCH_ARM_32 && !HAVE_SMP) || (ARCH_ARM_64 && !HAVE_SMP))
        depends on ((ARCH_X86_32 && !HAVE_SYSCALL) || (ARCH_X86_64 && !HAVE_SYSCALL) || (ARCH_ARM_32 && !HAVE_SYSCALL) || (ARCH_ARM_64 && !HAVE_SYSCALL))
        depends on !HAVE_PAGING
+       select HAVE_XENBUS
        imply XEN_PV_BUILD_P2M
        select LIBXENHEADERS
        select LIBUKDEBUG