From: Simon Kuenzer <simon@unikraft.io>
Date: Fri, 20 Sep 2024 12:13:13 +0000 (+0200)
Subject: plat/xen: Introduce `HAVE_XENBUS`
X-Git-Tag: RELEASE-0.18.0~12
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=acc5b4c410f6c20518b79ddd83922f8b51d48cd5;p=unikraft%2Funikraft.git

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 40ea67a35..0ffa3bbc6 100644
--- 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 459d02319..2b2f6ba69 100644
--- 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 4ef99adac..2323bfb45 100644
--- 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 354e3ea4f..2cba85c3a 100644
--- 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 e0d8f7f52..9de325463 100644
--- 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 2e3f95772..bd861f1f1 100644
--- 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 859d0ed50..84aa30a6f 100644
--- 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