[Minios-devel] [UNIKRAFT PATCH v3 9/9] plat/*: Update to <uk/ctors.h> changes

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Signed-off-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>
---
 plat/common/include/pci/pci_bus.h        | 4 ++--
 plat/drivers/include/virtio/virtio_bus.h | 5 +++--
 plat/xen/include/xenbus/xenbus.h         | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plat/common/include/pci/pci_bus.h 
b/plat/common/include/pci/pci_bus.h
index c8dbddae..db406a1b 100644
--- a/plat/common/include/pci/pci_bus.h
+++ b/plat/common/include/pci/pci_bus.h
@@ -160,8 +160,8 @@ struct pci_device {
 
 #define _PCI_REGFNNAME(x, y)      x##y
 
-#define PCI_REGISTER_CTOR(CTOR)                                \
-               UK_CTOR_FUNC(1, CTOR)
+#define PCI_REGISTER_CTOR(ctor)                                \
+       UK_CTOR_PRIO(ctor, UK_PRIO_AFTER(UK_BUS_REGISTER_PRIO))
 
 #define _PCI_REGISTER_DRIVER(libname, b)                               \
        static void                                             \
diff --git a/plat/drivers/include/virtio/virtio_bus.h 
b/plat/drivers/include/virtio/virtio_bus.h
index 72a82983..fcea5d63 100644
--- a/plat/drivers/include/virtio/virtio_bus.h
+++ b/plat/drivers/include/virtio/virtio_bus.h
@@ -41,6 +41,7 @@
 #include <uk/arch/types.h>
 #include <uk/arch/lcpu.h>
 #include <uk/alloc.h>
+#include <uk/bus.h>
 #include <virtio/virtio_config.h>
 #include <virtio/virtqueue.h>
 #include <uk/ctors.h>
@@ -335,8 +336,8 @@ static inline void virtio_dev_drv_up(struct virtio_dev 
*vdev)
 
 #define _VIRTIO_BUS_REGFNAME(x, y)       x##y
 
-#define _VIRTIO_REGISTER_CTOR(CTOR)    \
-       UK_CTOR_FUNC(1, CTOR)
+#define _VIRTIO_REGISTER_CTOR(ctor)    \
+       UK_CTOR_PRIO(ctor, UK_PRIO_AFTER(UK_BUS_REGISTER_PRIO))
 
 #define _VIRTIO_BUS_REGISTER_DRIVER(libname, b)                                
\
        static void                                                     \
diff --git a/plat/xen/include/xenbus/xenbus.h b/plat/xen/include/xenbus/xenbus.h
index a7872392..9fc942bc 100644
--- a/plat/xen/include/xenbus/xenbus.h
+++ b/plat/xen/include/xenbus/xenbus.h
@@ -78,8 +78,8 @@ UK_TAILQ_HEAD(xenbus_driver_list, struct xenbus_driver);
 
 #define _XENBUS_REGFNNAME(x, y)      x##y
 
-#define _XENBUS_REGISTER_CTOR(CTOR)  \
-       UK_CTOR_FUNC(1, CTOR)
+#define _XENBUS_REGISTER_CTOR(ctor)  \
+       UK_CTOR_PRIO(ctor, UK_PRIO_AFTER(UK_BUS_REGISTER_PRIO))
 
 #define _XENBUS_REGISTER_DRIVER(libname, b)                            \
        static void                                                     \
-- 
2.20.1


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