Re: [PATCH 5/7] mini-os: Moved arch-specific xenbus code under arch

[Julien Grall <julien.grall@linaro.org>]

Hi Thomas,

Thank you for the patch.

On 06/04/2014 05:06 PM, Thomas Leonard wrote:
> From: Karim Raslan <karim.allah.ahmed@gmail.com>
> 
> Signed-off-by: Karim Allah Ahmed <karim.allah.ahmed@gmail.com>
> [talex5@gmail.com: separated from big ARM commit]
> Signed-off-by: Thomas Leonard <talex5@gmail.com>
> ---
>  extras/mini-os/arch/x86/xenbus.c | 10 ++++++++++
>  extras/mini-os/xenbus/xenbus.c   | 17 +++++++++++------
>  2 files changed, 21 insertions(+), 6 deletions(-)
>  create mode 100644 extras/mini-os/arch/x86/xenbus.c
> 
> diff --git a/extras/mini-os/arch/x86/xenbus.c b/extras/mini-os/arch/x86/xenbus.c
> new file mode 100644
> index 0000000..5cda78d
> --- /dev/null
> +++ b/extras/mini-os/arch/x86/xenbus.c
> @@ -0,0 +1,10 @@
> +#include <mini-os/os.h>
> +#include <mini-os/mm.h>
> +#include <mini-os/xmalloc.h>
> +#include <xen/xen.h>
> +#include <xen/io/xs_wire.h>
> +
> +void arch_init_xenbus(struct xenstore_domain_interface **xenstore_buf, uint32_t *store_evtchn) {

The mini-os coding style requests the '{' on a newline for function
declaration.

> +    *xenstore_buf = mfn_to_virt(start_info.store_mfn);
> +    *store_evtchn = start_info.store_evtchn;
> +}
> diff --git a/extras/mini-os/xenbus/xenbus.c b/extras/mini-os/xenbus/xenbus.c
> index 934f23b..d995020 100644
> --- a/extras/mini-os/xenbus/xenbus.c
> +++ b/extras/mini-os/xenbus/xenbus.c
> @@ -27,6 +27,7 @@
>  #include <mini-os/wait.h>
>  #include <xen/io/xs_wire.h>
>  #include <mini-os/spinlock.h>
> +#include <mini-os/hypervisor.h>
>  #include <mini-os/xmalloc.h>
>  
>  #define min(x,y) ({                       \
> @@ -43,6 +44,7 @@
>  #endif
>  
>  static struct xenstore_domain_interface *xenstore_buf;
> +static uint32_t store_evtchn;
>  static DECLARE_WAIT_QUEUE_HEAD(xb_waitq);
>  DECLARE_WAIT_QUEUE_HEAD(xenbus_watch_queue);
>  
> @@ -325,20 +327,23 @@ static int allocate_xenbus_id(void)
>      return o_probe;
>  }
>  
> +void arch_init_xenbus(struct xenstore_domain_interface **xenstore_buf, uint32_t *store_evtchn);
> +

Likewise in the previous patch, this prototype should go in an header.
Maybe be include/xenbus.h?

Regards,

-- 
Julien Grall