From 66cf10f89524aaa65f7c8ee584fc5f1b841e522f Mon Sep 17 00:00:00 2001 From: Simon Kuenzer Date: Tue, 17 Sep 2024 11:31:22 +0200 Subject: [PATCH] drivers/9pfront: Rename `libxen9pfront` to `lib9pfront` Rename the driver library and driver directory to better match the naming of Xen. Configuration options are adopted accordingly. Additionally, this commit improves the titles of the ring configuration options in the menu. Signed-off-by: Simon Kuenzer Reviewed-by: Oleksii Moisieiev Reviewed-by: Oleksii Moisieiev Reviewed-by: Michalis Pappas Approved-by: Michalis Pappas GitHub-Closes: #1501 --- drivers/xen/9p/Makefile.uk | 7 ------- drivers/xen/{9p => 9pfront}/9pfront.c | 8 ++++---- drivers/xen/{9p => 9pfront}/9pfront.h | 0 drivers/xen/{9p => 9pfront}/9pfront_xb.h | 0 drivers/xen/{9p => 9pfront}/9pfront_xs.c | 0 drivers/xen/{9p => 9pfront}/Config.uk | 18 +++++++++--------- drivers/xen/9pfront/Makefile.uk | 8 ++++++++ drivers/xen/9pfront/exportsyms.uk | 1 + drivers/xen/Makefile.uk | 2 +- plat/xen/Config.uk | 2 +- 10 files changed, 24 insertions(+), 22 deletions(-) delete mode 100644 drivers/xen/9p/Makefile.uk rename drivers/xen/{9p => 9pfront}/9pfront.c (98%) rename drivers/xen/{9p => 9pfront}/9pfront.h (100%) rename drivers/xen/{9p => 9pfront}/9pfront_xb.h (100%) rename drivers/xen/{9p => 9pfront}/9pfront_xs.c (100%) rename drivers/xen/{9p => 9pfront}/Config.uk (61%) create mode 100644 drivers/xen/9pfront/Makefile.uk create mode 100644 drivers/xen/9pfront/exportsyms.uk diff --git a/drivers/xen/9p/Makefile.uk b/drivers/xen/9p/Makefile.uk deleted file mode 100644 index ef81b98f1..000000000 --- a/drivers/xen/9p/Makefile.uk +++ /dev/null @@ -1,7 +0,0 @@ -$(eval $(call addlib_s,libxen9pfront,$(CONFIG_LIBXEN_9PFRONT))) - -LIBXEN9PFRONT_CFLAGS-y += $(LIBXENPLAT_CFLAGS-y) -LIBXEN9PFRONT_CINCLUDES-y += $(LIBXENPLAT_CINCLUDES-y) -LIBXEN9PFRONT_CINCLUDES-y += $(LIBXENBUS_CINCLUDES-y) -LIBXEN9PFRONT_SRCS-y += $(LIBXEN9PFRONT_BASE)/9pfront.c -LIBXEN9PFRONT_SRCS-y += $(LIBXEN9PFRONT_BASE)/9pfront_xs.c diff --git a/drivers/xen/9p/9pfront.c b/drivers/xen/9pfront/9pfront.c similarity index 98% rename from drivers/xen/9p/9pfront.c rename to drivers/xen/9pfront/9pfront.c index bf1139f40..d7d74317a 100644 --- a/drivers/xen/9p/9pfront.c +++ b/drivers/xen/9pfront/9pfront.c @@ -479,10 +479,10 @@ static int p9front_add_dev(struct xenbus_device *xendev) uk_pr_info("Initialized 9pfront dev: tag=%s,maxrings=%d,maxorder=%d\n", p9fdev->tag, p9fdev->nb_max_rings, p9fdev->max_ring_page_order); - p9fdev->nb_rings = MIN(CONFIG_LIBXEN_9PFRONT_NB_RINGS, - p9fdev->nb_max_rings); - p9fdev->ring_order = MIN(CONFIG_LIBXEN_9PFRONT_RING_ORDER, - p9fdev->max_ring_page_order); + p9fdev->nb_rings = MIN(CONFIG_LIB9PFRONT_NB_RINGS, + p9fdev->nb_max_rings); + p9fdev->ring_order = MIN(CONFIG_LIB9PFRONT_RING_ORDER, + p9fdev->max_ring_page_order); rc = p9front_allocate_dev_rings(p9fdev); if (rc) { diff --git a/drivers/xen/9p/9pfront.h b/drivers/xen/9pfront/9pfront.h similarity index 100% rename from drivers/xen/9p/9pfront.h rename to drivers/xen/9pfront/9pfront.h diff --git a/drivers/xen/9p/9pfront_xb.h b/drivers/xen/9pfront/9pfront_xb.h similarity index 100% rename from drivers/xen/9p/9pfront_xb.h rename to drivers/xen/9pfront/9pfront_xb.h diff --git a/drivers/xen/9p/9pfront_xs.c b/drivers/xen/9pfront/9pfront_xs.c similarity index 100% rename from drivers/xen/9p/9pfront_xs.c rename to drivers/xen/9pfront/9pfront_xs.c diff --git a/drivers/xen/9p/Config.uk b/drivers/xen/9pfront/Config.uk similarity index 61% rename from drivers/xen/9p/Config.uk rename to drivers/xen/9pfront/Config.uk index af0d5fbb7..40ea67a35 100644 --- a/drivers/xen/9p/Config.uk +++ b/drivers/xen/9pfront/Config.uk @@ -1,25 +1,25 @@ -menuconfig LIBXEN_9PFRONT - bool "Xenbus 9pfront Driver" +menuconfig LIB9PFRONT + bool "9pfront: Xen 9pfs volumes" select LIBXENBUS select LIBXENHEADERS depends on PLAT_XEN depends on LIBUK9P help - Driver for 9pfs devices + Xen driver for 9pfs volumes -config LIBXEN_9PFRONT_NB_RINGS - int "Xen 9P ring number" +if LIB9PFRONT +config LIB9PFRONT_NB_RINGS + int "Number of rings" default 2 - depends on LIBXEN_9PFRONT help Number of rings to allocate. Will be clamped to the maximum value allowed by the backend. -config LIBXEN_9PFRONT_RING_ORDER - int "Xen 9P ring order" +config LIB9PFRONT_RING_ORDER + int "Ring size order" default 6 - depends on LIBXEN_9PFRONT help Ring order for xen 9P devices. Orders of 0, 1, 2, ..., 9 will create rings of size 4K, 8K, 16K, ..., 2M respectively. Will be clamped to the maximum value allowed by the backend. +endif diff --git a/drivers/xen/9pfront/Makefile.uk b/drivers/xen/9pfront/Makefile.uk new file mode 100644 index 000000000..d2e0416ab --- /dev/null +++ b/drivers/xen/9pfront/Makefile.uk @@ -0,0 +1,8 @@ +$(eval $(call addlib_s,lib9pfront,$(CONFIG_LIB9PFRONT))) + +# FIXME: Extra includes should be removed +LIB9PFRONT_CFLAGS-y += $(LIBXENPLAT_CFLAGS-y) +LIB9PFRONT_CINCLUDES-y += $(LIBXENPLAT_CINCLUDES-y) +LIB9PFRONT_CINCLUDES-y += $(LIBXENBUS_CINCLUDES-y) +LIB9PFRONT_SRCS-y += $(LIB9PFRONT_BASE)/9pfront.c +LIB9PFRONT_SRCS-y += $(LIB9PFRONT_BASE)/9pfront_xs.c diff --git a/drivers/xen/9pfront/exportsyms.uk b/drivers/xen/9pfront/exportsyms.uk new file mode 100644 index 000000000..32986ffc9 --- /dev/null +++ b/drivers/xen/9pfront/exportsyms.uk @@ -0,0 +1 @@ +# No public symbols diff --git a/drivers/xen/Makefile.uk b/drivers/xen/Makefile.uk index 81540bdcd..7ba196811 100644 --- a/drivers/xen/Makefile.uk +++ b/drivers/xen/Makefile.uk @@ -7,7 +7,7 @@ UK_DRIV_XEN_BASE := $(UK_DRIV_BASE)/xen $(eval $(call import_lib,$(UK_DRIV_XEN_BASE)/xenheaders)) -$(eval $(call import_lib,$(UK_DRIV_XEN_BASE)/9p)) +$(eval $(call import_lib,$(UK_DRIV_XEN_BASE)/9pfront)) $(eval $(call import_lib,$(UK_DRIV_XEN_BASE)/blk)) $(eval $(call import_lib,$(UK_DRIV_XEN_BASE)/net)) $(eval $(call import_lib,$(UK_DRIV_XEN_BASE)/xenbus)) diff --git a/plat/xen/Config.uk b/plat/xen/Config.uk index 8a868f61f..e0f3d935b 100644 --- a/plat/xen/Config.uk +++ b/plat/xen/Config.uk @@ -17,7 +17,7 @@ menuconfig PLAT_XEN select HAVE_INTCTLR imply LIBUKINTCTLR_GICV3 if ARCH_ARM_64 imply LIBXEN_NETFRONT if LIBUKNETDEV - imply LIBXEN_9PFRONT if LIBUK9P + imply LIB9PFRONT if LIBUK9P imply LIBXEN_BLKFRONT if LIBUKBLKDEV imply LIBXEN_CONSOLE help -- 2.39.5