[Minios-devel] [UNIKRAFT PATCH 6/9] lib/ukbus: Update to <uk/ctors.h> changes

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Signed-off-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>
---
 lib/ukbus/bus.c            | 2 +-
 lib/ukbus/include/uk/bus.h | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/ukbus/bus.c b/lib/ukbus/bus.c
index 45de2445..1d63f4dc 100644
--- a/lib/ukbus/bus.c
+++ b/lib/ukbus/bus.c
@@ -139,4 +139,4 @@ static int uk_bus_lib_init(void)
        uk_bus_probe_all();
        return 0;
 }
-uk_early_initcall_prio(uk_bus_lib_init, 0);
+uk_initcall_class_prio(uk_bus_lib_init, UK_BUS_INIT_CLASS, UK_BUS_INIT_PRIO);
diff --git a/lib/ukbus/include/uk/bus.h b/lib/ukbus/include/uk/bus.h
index bff94bbd..fcb68421 100644
--- a/lib/ukbus/include/uk/bus.h
+++ b/lib/ukbus/include/uk/bus.h
@@ -44,6 +44,10 @@
 extern "C" {
 #endif
 
+#define UK_BUS_INIT_CLASS UK_INIT_CLASS_EARLY
+#define UK_BUS_INIT_PRIO  0
+#define UK_BUS_REGISTER_PRIO 0
+
 struct uk_bus;
 extern struct uk_list_head uk_bus_list;
 
@@ -70,9 +74,8 @@ void _uk_bus_unregister(struct uk_bus *b);
 
 #define _UK_BUS_REGFNNAME(x, y)      x##y
 
-#define _UK_BUS_REGISTER_CTOR(CTOR)  \
-       UK_CTOR_FUNC(0, CTOR)
-
+#define _UK_BUS_REGISTER_CTOR(ctor)  \
+       UK_CTOR_PRIO(ctor, UK_BUS_REGISTER_PRIO)
 
 #define _UK_BUS_REGISTER(libname, b)                           \
        static void                                             \
-- 
2.20.1


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