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

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

On 31.01.20 14:05, Vlad-Andrei BĂDOIU (78692) wrote:
> Hey Simon,
>
> I have noticed a problem with this patch. The the value of
> UK_BUS_REGISTER_PRIO is not defined without
>
> adding a #include <uk/bus.h> in the following files:
>
>
> plat/xen/include/xenbus/xenbus.h
>
> plat/drivers/include/virtio/virtio_bus.h
>
> plat/common/include/pci/pci_bus.h
Good that you found this! I am sorry. v3 is on the way...


> There are also several warnings caused by the removing of the libname
> from the ctor register function.
>
> I think that these should be fixed in a separate patch.
>
> Thanks,
>
> Vlad
>
> On 31.01.2020 01:17, Simon Kuenzer wrote:
> > Signed-off-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>
> > Reviewed-by: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>
> > ---
> >    plat/common/include/pci/pci_bus.h        | 4 ++--
> >    plat/drivers/include/virtio/virtio_bus.h | 4 ++--
> >    plat/xen/include/xenbus/xenbus.h         | 4 ++--
> >    3 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/plat/common/include/pci/pci_bus.h 
> > b/plat/common/include/pci/pci_bus.h
> > index c8dbddae..2dab7114 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(UK_PRIO_AFTER(UK_BUS_REGISTER_PRIO), ctor)
> >    
> >    #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..12aba94c 100644
> > --- a/plat/drivers/include/virtio/virtio_bus.h
> > +++ b/plat/drivers/include/virtio/virtio_bus.h
> > @@ -335,8 +335,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(UK_PRIO_AFTER(UK_BUS_REGISTER_PRIO), ctor)
> >    
> >    #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..915f983b 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(UK_PRIO_AFTER(UK_BUS_REGISTER_PRIO), ctor)
> >    
> >    #define _XENBUS_REGISTER_DRIVER(libname, b)				\
> >         static void                                                     \
_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel