[Xen-changelog] [xen master] mini-os: don't include lib.h from mm.h

[patchbot@xxxxxxx]

commit a80e7d0d392076a0466cc3a1476aeb24182401de
Author:     Thomas Leonard <talex5@xxxxxxxxx>
AuthorDate: Fri Aug 8 16:47:30 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Mon Sep 8 12:15:27 2014 +0100

    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>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Acked-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
---
 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 +
 stubdom/vtpmmgr/disk_tpm.c         |    1 +
 stubdom/vtpmmgr/vtpm_cmd_handler.c |    1 +
 7 files changed, 7 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 dc4134a..b067cb7 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
diff --git a/stubdom/vtpmmgr/disk_tpm.c b/stubdom/vtpmmgr/disk_tpm.c
index a9f4552..d650fbc 100644
--- a/stubdom/vtpmmgr/disk_tpm.c
+++ b/stubdom/vtpmmgr/disk_tpm.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <mini-os/byteorder.h>
+#include <mini-os/lib.h>
 #include <polarssl/aes.h>
 #include <polarssl/sha1.h>
 
diff --git a/stubdom/vtpmmgr/vtpm_cmd_handler.c 
b/stubdom/vtpmmgr/vtpm_cmd_handler.c
index 8a42790..13ead93 100644
--- a/stubdom/vtpmmgr/vtpm_cmd_handler.c
+++ b/stubdom/vtpmmgr/vtpm_cmd_handler.c
@@ -38,6 +38,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <mini-os/console.h>
+#include <mini-os/lib.h>
 #include <polarssl/sha1.h>
 #include <polarssl/sha2.h>
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog