Re: [Xen-devel] [PATCH ARM v6 02/14] mini-os: don't include lib.h from mm.h

[Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>]

Thomas Leonard, le Wed 16 Jul 2014 14:30:43 +0100, a écrit :
> On 16 July 2014 12:07, Thomas Leonard <talex5@xxxxxxxxx> wrote:
> > This breaks the include cycle hypervisor.h -> hypercall-x86_32.h -> mm.h
> > -> lib.h -> gntmap.h -> os.h -> hypervisor.h.
> 
> I've just realised this is missing an include in tpm_tis.c (which
> isn't built by default). Fixed patch attached.

Acked-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>

> 
> -- 
> Dr Thomas Leonard        http://0install.net/
> GPG: 9242 9807 C985 3C07 44A6  8B9A AE07 8280 59A5 3CC1
> GPG: DA98 25AE CAD0 8975 7CDA  BD8E 0713 3F96 CA74 D8BA

> From 98705b128feb2e46272c4d29205f384899108704 Mon Sep 17 00:00:00 2001
> From: Thomas Leonard <talex5@xxxxxxxxx>
> Date: Mon, 7 Jul 2014 13:20:43 +0100
> Subject: [PATCH] mini-os: don't include lib.h from mm.h
> 
> This breaks the include cycle hypervisor.h -> hypercall-x86_32.h -> mm.h
> -> lib.h -> gntmap.h -> os.h -> hypervisor.h.
> 
> Signed-off-by: Thomas Leonard <talex5@xxxxxxxxx>
> 
> ---
> 
> - Added missing #include <mini-os/lib.h> to tpm_tis.c
> ---
>  extras/mini-os/include/mm.h | 3 +--
>  extras/mini-os/lock.c       | 1 +
>  extras/mini-os/main.c       | 1 +
>  extras/mini-os/tpm_tis.c    | 1 +
>  extras/mini-os/tpmfront.c   | 1 +
>  5 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/extras/mini-os/include/mm.h b/extras/mini-os/include/mm.h
> index a94cd6d..a177251 100644
> --- a/extras/mini-os/include/mm.h
> +++ b/extras/mini-os/include/mm.h
> @@ -32,8 +32,7 @@
>  #else
>  #error "Unsupported architecture"
>  #endif
> -
> -#include <mini-os/lib.h>
> +#include <xen/xen.h>
>  
>  #include <mini-os/arch_limits.h>
>  #include <mini-os/arch_mm.h>
> diff --git a/extras/mini-os/lock.c b/extras/mini-os/lock.c
> index 71a4971..61194e5 100644
> --- a/extras/mini-os/lock.c
> +++ b/extras/mini-os/lock.c
> @@ -9,6 +9,7 @@
>  #include <sys/lock.h>
>  #include <sched.h>
>  #include <wait.h>
> +#include <mini-os/lib.h>
>  
>  int ___lock_init(_LOCK_T *lock)
>  {
> diff --git a/extras/mini-os/main.c b/extras/mini-os/main.c
> index aec0586..4ec40b5 100644
> --- a/extras/mini-os/main.c
> +++ b/extras/mini-os/main.c
> @@ -15,6 +15,7 @@
>  #include <unistd.h>
>  #include <xenbus.h>
>  #include <events.h>
> +#include <mini-os/lib.h>
>  
>  extern int main(int argc, char *argv[], char *envp[]);
>  extern void __libc_init_array(void);
> diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os/tpm_tis.c
> index e8ca69f..09234e5 100644
> --- a/extras/mini-os/tpm_tis.c
> +++ b/extras/mini-os/tpm_tis.c
> @@ -26,6 +26,7 @@
>  #include <mini-os/events.h>
>  #include <mini-os/wait.h>
>  #include <mini-os/xmalloc.h>
> +#include <mini-os/lib.h>
>  #include <errno.h>
>  #include <stdbool.h>
>  
> diff --git a/extras/mini-os/tpmfront.c b/extras/mini-os/tpmfront.c
> index ce5b3e1..6049244 100644
> --- a/extras/mini-os/tpmfront.c
> +++ b/extras/mini-os/tpmfront.c
> @@ -31,6 +31,7 @@
>  #include <xen/io/xenbus.h>
>  #include <xen/io/tpmif.h>
>  #include <mini-os/tpmfront.h>
> +#include <mini-os/lib.h>
>  #include <fcntl.h>
>  
>  //#define TPMFRONT_PRINT_DEBUG
> -- 
> 2.0.1
> 


-- 
Samuel
<d> bah à défaut de ligne TGV, ils ont un GR
 -+- #ens-mim - comment ça, paumé ?! -+-

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel