stubdom/minios: re-structure headers

As part of making stubdom usable on NetBSD, it is necessary to
restructure the minios headers to avoid conflicts with NetBSD's
crossbuild toolchain.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff --git a/arch/ia64/common.c b/arch/ia64/common.c
index c82e604bacedfb8e8a7513561ed453d3ad9deac7..14958cd4ec4538491a1e54816ff8fc2cae076998 100644 (file)
--- a/arch/ia64/common.c
+++ b/arch/ia64/common.c
@@ -31,19 +31,19 @@
  */
 
 
-#include "os.h"
-#include "types.h"
-#include "lib.h"
-#include "page.h"
-#include "xen/xen.h"
-#include "privop.h"
-#include "xen/callback.h"
-#include "ia64_cpu.h"
-#include "hypervisor.h"
-#include "events.h"
-#include "console.h"
-#include "time.h"
-#include "xmalloc.h"
+#include <mini-os/os.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/page.h>
+#include <xen/xen.h>
+#include <mini-os/privop.h>
+#include <xen/callback.h>
+#include <mini-os/ia64_cpu.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/events.h>
+#include <mini-os/console.h>
+#include <mini-os/time.h>
+#include <mini-os/xmalloc.h>
 
 
 /* For more console boot messages. */

diff --git a/arch/ia64/debug.c b/arch/ia64/debug.c
index f5b378381fbfe80c3de13e82bdb0ffac667ba7f3..f0e57776f7f23163d7adad9532c357a23e9d32ad 100644 (file)
--- a/arch/ia64/debug.c
+++ b/arch/ia64/debug.c
@@ -27,7 +27,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "os.h"
+#include <mini-os/os.h>
 
 static const char *ia64_vector_names[] = {
        "VHPT Translation",                     /* 0 */

diff --git a/arch/ia64/efi.c b/arch/ia64/efi.c
index cdb25b33ece5ec5face2395998ede51dd3bb1b22..009375e717b374090a4fed73d59e2f80114af3ba 100644 (file)
--- a/arch/ia64/efi.c
+++ b/arch/ia64/efi.c
@@ -28,11 +28,11 @@
  */
 
 
-#include "os.h"
-#include "efi.h"
-#include "page.h"
-#include "lib.h"
-#include "console.h"
+#include <mini-os/os.h>
+#include <mini-os/efi.h>
+#include <mini-os/page.h>
+#include <mini-os/lib.h>
+#include <mini-os/console.h>
 
 
 /* The implementation is in fw.S. */

diff --git a/arch/ia64/fw.S b/arch/ia64/fw.S
index ef2c4d2d2f1ad28c04b16fed858d47ec69e7c5fd..2ed4dc30719b05091eb5288b937c1f2fdbfe29e0 100644 (file)
--- a/arch/ia64/fw.S
+++ b/arch/ia64/fw.S
@@ -28,12 +28,12 @@
  */
 
 
-#include "asm.h"
-#include "page.h"
-#include "ia64_cpu.h"
-#include "ia64_fpu.h"
-#include "offsets.h"
-#include "xen/xen.h"
+#include <mini-os/asm.h>
+#include <mini-os/page.h>
+#include <mini-os/ia64_cpu.h>
+#include <mini-os/ia64_fpu.h>
+#include <mini-os/offsets.h>
+#include <mini-os/xen/xen.h>
 
 
 /*

diff --git a/arch/ia64/gen_off.c b/arch/ia64/gen_off.c
index 2c67a8c352848cf463baeb5fb5c5890571360578..f547f233cb24d4c02e98ae5729d0b9e45e563182 100644 (file)
--- a/arch/ia64/gen_off.c
+++ b/arch/ia64/gen_off.c
@@ -25,10 +25,10 @@
  * SUCH DAMAGE.
  *
  */
-#include "types.h"
-#include "sched.h"
-#include "xen/xen.h"
-#include "xen/arch-ia64.h"
+#include <mini-os/types.h>
+#include <mini-os/sched.h>
+#include <xen/xen.h>
+#include <xen/arch-ia64.h>
 
 #define DEFINE(sym, val)                                       \
   asm volatile("\n->" sym " %0 /* " #val " */": : "i" (val))

diff --git a/arch/ia64/ia64.S b/arch/ia64/ia64.S
index adcf1769a2953c3b375a8c8dbb41b1bb037c28b3..8fde08977d1cfc54a010b9c9b821f05ec24f789d 100644 (file)
--- a/arch/ia64/ia64.S
+++ b/arch/ia64/ia64.S
@@ -23,12 +23,12 @@
 
 
 
-#include "asm.h"
-#include "page.h"
-#include "ia64_cpu.h"
-#include "ia64_fpu.h"
-#include "privop.h"
-#include "offsets.h"
+#include <mini-os/asm.h>
+#include <mini-os/page.h>
+#include <mini-os/ia64_cpu.h>
+#include <mini-os/ia64_fpu.h>
+#include <mini-os/privop.h>
+#include <mini-os/offsets.h>
 
 
 

diff --git a/arch/ia64/ivt.S b/arch/ia64/ivt.S
index 8971b3bee9b8c26df01c013adf46e48bc0388194..863a498213bc756aaccc4e6ceaa00714f366b096 100644 (file)
--- a/arch/ia64/ivt.S
+++ b/arch/ia64/ivt.S
@@ -24,11 +24,11 @@
  */
 
 
-#include "asm.h"
-#include "page.h"
-#include "ia64_cpu.h"
-#include "privop.h"
-#include "offsets.h"
+#include <mini-os/asm.h>
+#include <mini-os/page.h>
+#include <mini-os/ia64_cpu.h>
+#include <mini-os/privop.h>
+#include <mini-os/offsets.h>
 
 
 /* General register usage in interrupt handling:

diff --git a/arch/ia64/mm.c b/arch/ia64/mm.c
index c6aef8331f7154ac7a0c981a8f7ef7a669f12654..b171f75dc3395315744624d3a2657cb47d521d75 100644 (file)
--- a/arch/ia64/mm.c
+++ b/arch/ia64/mm.c
@@ -26,8 +26,8 @@
  */
 
 
-#include "os.h"
-#include "mm.h"
+#include <mini-os/os.h>
+#include <mini-os/mm.h>
 
 
 #define MAX_MEM_AREA   5

diff --git a/arch/ia64/sal.c b/arch/ia64/sal.c
index 286e5be38c9b1abe0b7a959ef9c720a2bd36b2d4..7fa7f94acdcaedf140c7a9e1db4752682e918eb1 100644 (file)
--- a/arch/ia64/sal.c
+++ b/arch/ia64/sal.c
@@ -27,10 +27,10 @@
  *
  */
 
-#include "os.h"
-#include "lib.h"
-#include "console.h"
-#include "page.h"
+#include <mini-os/os.h>
+#include <mini-os/lib.h>
+#include <mini-os/console.h>
+#include <mini-os/page.h>
 
 
 static struct ia64_fdesc sal_fdesc;

diff --git a/arch/ia64/sched.c b/arch/ia64/sched.c
index 5eea71e07745c8eaf1ea6ac191cba45be38525b1..ae9e6615469f991a019393b9e0ad33fea821aeb7 100644 (file)
--- a/arch/ia64/sched.c
+++ b/arch/ia64/sched.c
@@ -25,11 +25,11 @@
  */
 
 
-#include "types.h"
-#include "sched.h"
-#include "lib.h"
-#include "xmalloc.h"
-#include "mm.h"
+#include <mini-os/types.h>
+#include <mini-os/sched.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/mm.h>
 
 /* The function is implemented in fw.S */
 extern void thread_starter(void);

diff --git a/arch/ia64/time.c b/arch/ia64/time.c
index 4a3a558dc36263613701af892b8791f804b95912..53412660f7f7fba3f61479576a3901d977034f3e 100644 (file)
--- a/arch/ia64/time.c
+++ b/arch/ia64/time.c
@@ -27,11 +27,11 @@
  * SUCH DAMAGE.
  */
 
-#include "os.h"
-#include "console.h"
-#include "time.h"
-#include "efi.h"
-#include "events.h"
+#include <mini-os/os.h>
+#include <mini-os/console.h>
+#include <mini-os/time.h>
+#include <mini-os/efi.h>
+#include <mini-os/events.h>
 
 struct timespec os_time;
 static uint64_t itc_alt;               /* itc on last update. */

diff --git a/arch/ia64/xencomm.c b/arch/ia64/xencomm.c
index fccfee2f1e5c13c06cd2bffc4a7799c630e8cd83..9719e49f18e4533e1885959b19c0e1f25db1069b 100644 (file)
--- a/arch/ia64/xencomm.c
+++ b/arch/ia64/xencomm.c
@@ -23,10 +23,10 @@
  */
 
 
-#include <os.h>
+#include <mini-os/os.h>
 #include <mini-os/errno.h>
 #include <mini-os/lib.h>
-#include <hypervisor.h>
+#include <mini-os/hypervisor.h>
 #include <xen/xencomm.h>
 #include <xen/grant_table.h>
 

diff --git a/arch/x86/ioremap.c b/arch/x86/ioremap.c
index d94f4e72a7d10abefbf43e22efc55cb50b8c0f58..f55d9e078e7c39274c20bb29d88f2aa2ca23ec59 100644 (file)
--- a/arch/x86/ioremap.c
+++ b/arch/x86/ioremap.c
@@ -21,11 +21,11 @@
  */
 
 
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
-#include <mm.h>
-#include <ioremap.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/mm.h>
+#include <mini-os/ioremap.h>
 
 /* Map a physical address range into virtual address space with provided
  * flags. Return a virtual address range it is mapped to. */

diff --git a/arch/x86/mm.c b/arch/x86/mm.c
index 723fc567e9212696c0346228bcc9c93dc1047b2d..8d688fc25a572a1e3d38ad5c20f45fce5ffcc969 100644 (file)
--- a/arch/x86/mm.c
+++ b/arch/x86/mm.c
@@ -34,12 +34,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <hypervisor.h>
-#include <mm.h>
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
+#include <mini-os/os.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/mm.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
 #include <xen/memory.h>
 
 #ifdef MM_DEBUG

diff --git a/arch/x86/sched.c b/arch/x86/sched.c
index 9b98b93a554fbeebaa79419d1f926ef56afd7315..8a05b58dcb6ea040089a2f32453d29b4ad1a63c1 100644 (file)
--- a/arch/x86/sched.c
+++ b/arch/x86/sched.c
@@ -35,16 +35,16 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <hypervisor.h>
-#include <time.h>
-#include <mm.h>
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
-#include <list.h>
-#include <sched.h>
-#include <semaphore.h>
+#include <mini-os/os.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/time.h>
+#include <mini-os/mm.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/list.h>
+#include <mini-os/sched.h>
+#include <mini-os/semaphore.h>
 
 
 #ifdef SCHED_DEBUG

diff --git a/arch/x86/setup.c b/arch/x86/setup.c
index 8509079d3eeadb05faa76f650a415b8145db2aee..923901e595f0526bf858bcdbb581b0422f6e481f 100644 (file)
--- a/arch/x86/setup.c
+++ b/arch/x86/setup.c
@@ -26,8 +26,8 @@
  *
  */
 
-#include <os.h>
-
+#include <mini-os/os.h>
+#include <mini-os/lib.h> /* for printk, memcpy */
 
 /*
  * Shared page for communicating with the hypervisor.

diff --git a/arch/x86/time.c b/arch/x86/time.c
index a55bf59ee60d03e963953d837dceca26311285f0..89bc3826e81abe257dc0e349b10644d3c810779d 100644 (file)
--- a/arch/x86/time.c
+++ b/arch/x86/time.c
@@ -32,13 +32,13 @@
  */
 
 
-#include <os.h>
-#include <traps.h>
-#include <types.h>
-#include <hypervisor.h>
-#include <events.h>
-#include <time.h>
-#include <lib.h>
+#include <mini-os/os.h>
+#include <mini-os/traps.h>
+#include <mini-os/types.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/events.h>
+#include <mini-os/time.h>
+#include <mini-os/lib.h>
 
 /************************************************************************
  * Time functions

diff --git a/arch/x86/traps.c b/arch/x86/traps.c
index f641d90f2e07cdbf23a5098a6929d4369fedf42e..516d133ec8cef13a564ef7e5647151f9eec4ec97 100644 (file)
--- a/arch/x86/traps.c
+++ b/arch/x86/traps.c
@@ -1,10 +1,10 @@
 
-#include <os.h>
-#include <traps.h>
-#include <hypervisor.h>
-#include <mm.h>
-#include <lib.h>
-#include <sched.h>
+#include <mini-os/os.h>
+#include <mini-os/traps.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/mm.h>
+#include <mini-os/lib.h>
+#include <mini-os/sched.h>
 
 /*
  * These are assembler stubs in entry.S.

diff --git a/arch/x86/x86_32.S b/arch/x86/x86_32.S
index e1426acac00603f27fb0f98dfc1d04b479264b15..fb3e30a357f7130b35efe1d119e56a5f4243466f 100644 (file)
--- a/arch/x86/x86_32.S
+++ b/arch/x86/x86_32.S
@@ -1,5 +1,5 @@
-#include <os.h>
-#include <arch_limits.h>
+#include <mini-os/os.h>
+#include <mini-os/x86/arch_limits.h>
 #include <xen/arch-x86_32.h>
 
 .section __xen_guest

diff --git a/arch/x86/x86_64.S b/arch/x86/x86_64.S
index a8b1933da26724b0b972b22f8f9cb046d5238996..a65e5d5d8e0c12bb67342ef597fdf1e2c5e79aac 100644 (file)
--- a/arch/x86/x86_64.S
+++ b/arch/x86/x86_64.S
@@ -1,5 +1,5 @@
-#include <os.h>
-#include <arch_limits.h>
+#include <mini-os/os.h>
+#include <mini-os/x86/arch_limits.h>
 #include <xen/features.h>
 
 .section __xen_guest

diff --git a/blkfront.c b/blkfront.c
index bba1a2ffa654ada4ed2f544abc43e3722bab6ac8..a451e98f0211420eaeb6d6fdaedfb36d03b63e22 100644 (file)
--- a/blkfront.c
+++ b/blkfront.c
@@ -3,17 +3,18 @@
  * Based on netfront.c.
  */
 
-#include <os.h>
-#include <xenbus.h>
-#include <events.h>
+#include <stdint.h>
+#include <mini-os/os.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/events.h>
 #include <errno.h>
 #include <xen/io/blkif.h>
 #include <xen/io/protocols.h>
-#include <gnttab.h>
-#include <xmalloc.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/xmalloc.h>
 #include <time.h>
-#include <blkfront.h>
-#include <lib.h>
+#include <mini-os/blkfront.h>
+#include <mini-os/lib.h>
 #include <fcntl.h>
 
 #ifndef HAVE_LIBC

diff --git a/console/console.c b/console/console.c
index 81cedcbd645fdd045942cb067371359286e092c7..1bd0405f4a070bece6a74f2bb1215018159a7fe7 100644 (file)
--- a/console/console.c
+++ b/console/console.c
@@ -34,14 +34,14 @@
  * DEALINGS IN THE SOFTWARE.
  */
  
-#include <types.h>
-#include <wait.h>
-#include <mm.h>
-#include <hypervisor.h>
-#include <events.h>
-#include <os.h>
-#include <lib.h>
-#include <xenbus.h>
+#include <mini-os/types.h>
+#include <mini-os/wait.h>
+#include <mini-os/mm.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/events.h>
+#include <mini-os/os.h>
+#include <mini-os/lib.h>
+#include <mini-os/xenbus.h>
 #include <xen/io/console.h>
 
 

diff --git a/console/xencons_ring.c b/console/xencons_ring.c
index a7a9827c00752e1209c8ac846aac41d213b281ba..3bb408f70a9624af8969aba311e04e583432d084 100644 (file)
--- a/console/xencons_ring.c
+++ b/console/xencons_ring.c
@@ -1,16 +1,16 @@
-#include <types.h>
-#include <wait.h>
-#include <mm.h>
-#include <hypervisor.h>
-#include <events.h>
-#include <os.h>
-#include <lib.h>
-#include <xenbus.h>
+#include <mini-os/types.h>
+#include <mini-os/wait.h>
+#include <mini-os/mm.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/events.h>
+#include <mini-os/os.h>
+#include <mini-os/lib.h>
+#include <mini-os/xenbus.h>
 #include <xen/io/console.h>
 #include <xen/io/protocols.h>
 #include <xen/io/ring.h>
-#include <xmalloc.h>
-#include <gnttab.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/gnttab.h>
 
 DECLARE_WAIT_QUEUE_HEAD(console_queue);
 

diff --git a/events.c b/events.c
index c907e652b9625544c1fc3acdcfef199159546f0c..2f359a54e7c811e486674a590453b8e929ceeba5 100644 (file)
--- a/events.c
+++ b/events.c
@@ -16,11 +16,11 @@
  ****************************************************************************
  */
 
-#include <os.h>
-#include <mm.h>
-#include <hypervisor.h>
-#include <events.h>
-#include <lib.h>
+#include <mini-os/os.h>
+#include <mini-os/mm.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/events.h>
+#include <mini-os/lib.h>
 
 #define NR_EVS 1024
 

diff --git a/fbfront.c b/fbfront.c
index 1406de021208ce622a64703aa91882beaf54f814..8cf1721975d76d632dfb07fed2800f4d5351b78d 100644 (file)
--- a/fbfront.c
+++ b/fbfront.c
@@ -4,16 +4,16 @@
  * Based on blkfront.c.
  */
 
-#include <os.h>
-#include <xenbus.h>
-#include <events.h>
+#include <mini-os/os.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/events.h>
 #include <xen/io/kbdif.h>
 #include <xen/io/fbif.h>
 #include <xen/io/protocols.h>
-#include <gnttab.h>
-#include <xmalloc.h>
-#include <fbfront.h>
-#include <lib.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/fbfront.h>
+#include <mini-os/lib.h>
 
 DECLARE_WAIT_QUEUE_HEAD(kbdfront_queue);
 

diff --git a/fs-front.c b/fs-front.c
index 7c4d68df5a98127db01edd88be36c6cf49016218..dd664caebca14088ea8c36be024d37fc06aa31c7 100644 (file)
--- a/fs-front.c
+++ b/fs-front.c
@@ -25,15 +25,16 @@
  */
 
 #undef NDEBUG
-#include <os.h>
-#include <list.h>
-#include <xmalloc.h>
-#include <xenbus.h>
-#include <gnttab.h>
-#include <events.h>
+#include <stdint.h>
+#include <mini-os/os.h>
+#include <mini-os/list.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/events.h>
 #include <xen/io/fsif.h>
-#include <fs.h>
-#include <sched.h>
+#include <mini-os/fs.h>
+#include <mini-os/sched.h>
 
 #define preempt_disable()
 #define preempt_enable()

diff --git a/gntmap.c b/gntmap.c
index abbd91ab3346953f8ad98a86c0be4591f39e0bb1..22ed450c8c02079696dfa7b2fcf3e73d5b1b0fb9 100644 (file)
--- a/gntmap.c
+++ b/gntmap.c
@@ -30,12 +30,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <xmalloc.h>
+#include <mini-os/os.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
 #include <errno.h>
 #include <xen/grant_table.h>
 #include <inttypes.h>
-#include "gntmap.h"
+#include <mini-os/gntmap.h>
 
 #define DEFAULT_MAX_GRANTS 128
 

diff --git a/gnttab.c b/gnttab.c
index 9b350523d59c036c000e471fa46128791495c3af..ebfa8ac5541ad3560737d2682a5bfbab3a2d5e62 100644 (file)
--- a/gnttab.c
+++ b/gnttab.c
@@ -15,10 +15,10 @@
  *
  ****************************************************************************
  */
-#include <os.h>
-#include <mm.h>
-#include <gnttab.h>
-#include <semaphore.h>
+#include <mini-os/os.h>
+#include <mini-os/mm.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/semaphore.h>
 
 #define NR_RESERVED_ENTRIES 8
 

diff --git a/hypervisor.c b/hypervisor.c
index dad8b59609c6ed34515ad5edbb7c57533220db53..b4688a059aaac4445dd96ef94135028b90dc5088 100644 (file)
--- a/hypervisor.c
+++ b/hypervisor.c
@@ -25,9 +25,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <hypervisor.h>
-#include <events.h>
+#include <mini-os/os.h>
+#include <mini-os/lib.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/events.h>
 
 #define active_evtchns(cpu,sh,idx)              \
     ((sh)->evtchn_pending[idx] &                \

diff --git a/kernel.c b/kernel.c
index 33c91b59ff96d355f8492604e27534aea7df1a12..19e4400be443d68d175d35a3d432d0595db5308c 100644 (file)
--- a/kernel.c
+++ b/kernel.c
@@ -27,22 +27,22 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <hypervisor.h>
-#include <mm.h>
-#include <events.h>
-#include <time.h>
-#include <types.h>
-#include <lib.h>
-#include <sched.h>
-#include <xenbus.h>
-#include <gnttab.h>
-#include <netfront.h>
-#include <blkfront.h>
-#include <fbfront.h>
-#include <pcifront.h>
-#include <fs.h>
-#include <xmalloc.h>
+#include <mini-os/os.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/mm.h>
+#include <mini-os/events.h>
+#include <mini-os/time.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/sched.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/netfront.h>
+#include <mini-os/blkfront.h>
+#include <mini-os/fbfront.h>
+#include <mini-os/pcifront.h>
+#include <mini-os/fs.h>
+#include <mini-os/xmalloc.h>
 #include <fcntl.h>
 #include <xen/features.h>
 #include <xen/version.h>

diff --git a/lib/math.c b/lib/math.c
index 55ece1ed510efe94a612b6a0f40042aedc4ab721..00a13a5004a30258500ca40c7a2f849a9dd804d2 100644 (file)
--- a/lib/math.c
+++ b/lib/math.c
@@ -55,9 +55,9 @@
  * $FreeBSD: src/sys/libkern/divdi3.c,v 1.6 1999/08/28 00:46:31 peter Exp $
 */
 
-#include <types.h>
-#include <lib.h>
-#include <time.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/time.h>
 
        /* On ia64 these functions lead to crashes. These are replaced by
         * assembler functions. */

diff --git a/lib/printf.c b/lib/printf.c
index a9866165864c570a04982fa927b3ac75c77936d5..833bb96a32a5b6a9ab7a451c2729e3b96aea86ed 100644 (file)
--- a/lib/printf.c
+++ b/lib/printf.c
@@ -56,13 +56,13 @@
 
 #if !defined HAVE_LIBC
 
-#include <os.h>
-#include <types.h>
-#include <hypervisor.h>
-#include <lib.h>
-#include <mm.h>
-#include <ctype.h>
-#include <limits.h>
+#include <mini-os/os.h>
+#include <mini-os/types.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/lib.h>
+#include <mini-os/mm.h>
+#include <mini-os/ctype.h>
+#include <mini-os/limits.h>
 
 /**
  * simple_strtoul - convert a string to an unsigned long

diff --git a/lib/stack_chk_fail.c b/lib/stack_chk_fail.c
index ade0045f0a885adbb17cba34b8532b954a4a97fc..05aea20059054042e997259079af0cb494a994ec 100644 (file)
--- a/lib/stack_chk_fail.c
+++ b/lib/stack_chk_fail.c
@@ -1,5 +1,5 @@
-#include <kernel.h>
-#include <console.h>
+#include <mini-os/kernel.h>
+#include <mini-os/console.h>
 
 void __stack_chk_fail(void)
 {

diff --git a/lib/string.c b/lib/string.c
index a6f2abe0b0906cc3497ca522a901abe99ef71b69..8b241464e2066a7c2eded5daa29f1408d7c7d553 100644 (file)
--- a/lib/string.c
+++ b/lib/string.c
@@ -57,10 +57,10 @@ int ffsll (long long int lli)
 
 #if !defined HAVE_LIBC
 
-#include <os.h>
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
+#include <mini-os/os.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
 
 int memcmp(const void * cs,const void * ct,size_t count)
 {

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index c33c48ab41062b7aed5e2de02e545d51e7baad50..14fe7961312fcaaf9843fad6872df9228255c728 100644 (file)
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -36,12 +36,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <os.h>
-#include <mm.h>
-#include <types.h>
-#include <lib.h>
-#include <list.h>
-#include <xmalloc.h>
+#include <mini-os/os.h>
+#include <mini-os/mm.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/list.h>
+#include <mini-os/xmalloc.h>
 
 #ifndef HAVE_LIBC
 static MINIOS_LIST_HEAD(freelist);

diff --git a/mm.c b/mm.c
index a5338b0053b0de56c191ad67afd56cb4f6d43858..743d45d051343b0b55e066e4ff490194a60810fe 100644 (file)
--- a/mm.c
+++ b/mm.c
@@ -34,13 +34,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <hypervisor.h>
+#include <mini-os/os.h>
+#include <mini-os/hypervisor.h>
 #include <xen/memory.h>
-#include <mm.h>
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
+#include <mini-os/mm.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
 
 #ifdef MM_DEBUG
 #define DEBUG(_f, _a...) \

diff --git a/netfront.c b/netfront.c
index ea092df0741ea75de3e0552c1135151e631d47c0..fd1a315b77f74f8135e2c400b5790bd82f8b25b5 100644 (file)
--- a/netfront.c
+++ b/netfront.c
@@ -5,17 +5,17 @@
  * Does not handle fragments or extras.
  */
 
-#include <os.h>
-#include <xenbus.h>
-#include <events.h>
+#include <mini-os/os.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/events.h>
 #include <errno.h>
 #include <xen/io/netif.h>
-#include <gnttab.h>
-#include <xmalloc.h>
-#include <time.h>
-#include <netfront.h>
-#include <lib.h>
-#include <semaphore.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/time.h>
+#include <mini-os/netfront.h>
+#include <mini-os/lib.h>
+#include <mini-os/semaphore.h>
 
 DECLARE_WAIT_QUEUE_HEAD(netfront_queue);
 

diff --git a/pcifront.c b/pcifront.c
index 70ea89b82db31ea199c74cb9a262e7125f8fa85a..d8a5a946fc2570e5ea782c0ac3308defa0027c51 100644 (file)
--- a/pcifront.c
+++ b/pcifront.c
@@ -3,14 +3,16 @@
  * Based on blkfront.c.
  */
 
-#include <os.h>
-#include <xenbus.h>
-#include <events.h>
+#include <string.h>
+#include <mini-os/os.h>
+#include <mini-os/lib.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/events.h>
 #include <errno.h>
-#include <gnttab.h>
-#include <xmalloc.h>
-#include <wait.h>
-#include <pcifront.h>
+#include <mini-os/gnttab.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/wait.h>
+#include <mini-os/pcifront.h>
 
 #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07))
 

diff --git a/sched.c b/sched.c
index b1e1d288b80e7815553174fec5931e724e543cee..c0229c5687401ad0af038769f1221bf672d08049 100644 (file)
--- a/sched.c
+++ b/sched.c
@@ -35,16 +35,16 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <os.h>
-#include <hypervisor.h>
-#include <time.h>
-#include <mm.h>
-#include <types.h>
-#include <lib.h>
-#include <xmalloc.h>
-#include <list.h>
-#include <sched.h>
-#include <semaphore.h>
+#include <mini-os/os.h>
+#include <mini-os/hypervisor.h>
+#include <mini-os/time.h>
+#include <mini-os/mm.h>
+#include <mini-os/types.h>
+#include <mini-os/lib.h>
+#include <mini-os/xmalloc.h>
+#include <mini-os/list.h>
+#include <mini-os/sched.h>
+#include <mini-os/semaphore.h>
 
 
 #ifdef SCHED_DEBUG

diff --git a/xenbus/xenbus.c b/xenbus/xenbus.c
index 958e010dab3bb3deecb98a59555c6f3562d408dd..916a3896440503b52161eb6b8246e55499b4f927 100644 (file)
--- a/xenbus/xenbus.c
+++ b/xenbus/xenbus.c
@@ -15,18 +15,18 @@
  *
  ****************************************************************************
  **/
-#include <os.h>
-#include <mm.h>
-#include <traps.h>
-#include <lib.h>
-#include <xenbus.h>
-#include <events.h>
-#include <errno.h>
-#include <sched.h>
-#include <wait.h>
+#include <mini-os/os.h>
+#include <mini-os/mm.h>
+#include <mini-os/traps.h>
+#include <mini-os/lib.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/events.h>
+#include <mini-os/errno.h>
+#include <mini-os/sched.h>
+#include <mini-os/wait.h>
 #include <xen/io/xs_wire.h>
-#include <spinlock.h>
-#include <xmalloc.h>
+#include <mini-os/spinlock.h>
+#include <mini-os/xmalloc.h>
 
 #define min(x,y) ({                       \
         typeof(x) tmpx = (x);                 \