aboutsummaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-10-01 12:28:54 +0100
committerKeir Fraser <keir.fraser@citrix.com>2009-10-01 12:28:54 +0100
commit643898034e176f5883ab70203ed01670d809c3b7 (patch)
tree1e6af86efb9659ad9781fcc19eb40fbc78d05d22 /extras
parent7cf56794ba0e22ad39e08659d360bf9af829a131 (diff)
downloadxen-643898034e176f5883ab70203ed01670d809c3b7.tar.gz
xen-643898034e176f5883ab70203ed01670d809c3b7.tar.bz2
xen-643898034e176f5883ab70203ed01670d809c3b7.zip
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>
Diffstat (limited to 'extras')
-rw-r--r--extras/mini-os/arch/ia64/common.c26
-rw-r--r--extras/mini-os/arch/ia64/debug.c2
-rw-r--r--extras/mini-os/arch/ia64/efi.c10
-rw-r--r--extras/mini-os/arch/ia64/fw.S12
-rw-r--r--extras/mini-os/arch/ia64/gen_off.c8
-rw-r--r--extras/mini-os/arch/ia64/ia64.S12
-rw-r--r--extras/mini-os/arch/ia64/ivt.S10
-rw-r--r--extras/mini-os/arch/ia64/mm.c4
-rw-r--r--extras/mini-os/arch/ia64/sal.c8
-rw-r--r--extras/mini-os/arch/ia64/sched.c10
-rw-r--r--extras/mini-os/arch/ia64/time.c10
-rw-r--r--extras/mini-os/arch/ia64/xencomm.c4
-rw-r--r--extras/mini-os/arch/x86/ioremap.c10
-rw-r--r--extras/mini-os/arch/x86/mm.c12
-rw-r--r--extras/mini-os/arch/x86/sched.c20
-rw-r--r--extras/mini-os/arch/x86/setup.c4
-rw-r--r--extras/mini-os/arch/x86/time.c14
-rw-r--r--extras/mini-os/arch/x86/traps.c12
-rw-r--r--extras/mini-os/arch/x86/x86_32.S4
-rw-r--r--extras/mini-os/arch/x86/x86_64.S4
-rw-r--r--extras/mini-os/blkfront.c15
-rw-r--r--extras/mini-os/console/console.c16
-rw-r--r--extras/mini-os/console/xencons_ring.c20
-rw-r--r--extras/mini-os/events.c10
-rw-r--r--extras/mini-os/fbfront.c14
-rw-r--r--extras/mini-os/fs-front.c17
-rw-r--r--extras/mini-os/gntmap.c7
-rw-r--r--extras/mini-os/gnttab.c8
-rw-r--r--extras/mini-os/hypervisor.c7
-rw-r--r--extras/mini-os/kernel.c32
-rw-r--r--extras/mini-os/lib/math.c6
-rw-r--r--extras/mini-os/lib/printf.c14
-rw-r--r--extras/mini-os/lib/stack_chk_fail.c4
-rw-r--r--extras/mini-os/lib/string.c8
-rw-r--r--extras/mini-os/lib/xmalloc.c12
-rw-r--r--extras/mini-os/mm.c12
-rw-r--r--extras/mini-os/netfront.c18
-rw-r--r--extras/mini-os/pcifront.c16
-rw-r--r--extras/mini-os/sched.c20
-rw-r--r--extras/mini-os/xenbus/xenbus.c22
40 files changed, 240 insertions, 234 deletions
diff --git a/extras/mini-os/arch/ia64/common.c b/extras/mini-os/arch/ia64/common.c
index c82e604bac..14958cd4ec 100644
--- a/extras/mini-os/arch/ia64/common.c
+++ b/extras/mini-os/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/extras/mini-os/arch/ia64/debug.c b/extras/mini-os/arch/ia64/debug.c
index f5b378381f..f0e57776f7 100644
--- a/extras/mini-os/arch/ia64/debug.c
+++ b/extras/mini-os/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/extras/mini-os/arch/ia64/efi.c b/extras/mini-os/arch/ia64/efi.c
index cdb25b33ec..009375e717 100644
--- a/extras/mini-os/arch/ia64/efi.c
+++ b/extras/mini-os/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/extras/mini-os/arch/ia64/fw.S b/extras/mini-os/arch/ia64/fw.S
index ef2c4d2d2f..2ed4dc3071 100644
--- a/extras/mini-os/arch/ia64/fw.S
+++ b/extras/mini-os/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/extras/mini-os/arch/ia64/gen_off.c b/extras/mini-os/arch/ia64/gen_off.c
index 2c67a8c352..f547f233cb 100644
--- a/extras/mini-os/arch/ia64/gen_off.c
+++ b/extras/mini-os/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/extras/mini-os/arch/ia64/ia64.S b/extras/mini-os/arch/ia64/ia64.S
index adcf1769a2..8fde08977d 100644
--- a/extras/mini-os/arch/ia64/ia64.S
+++ b/extras/mini-os/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/extras/mini-os/arch/ia64/ivt.S b/extras/mini-os/arch/ia64/ivt.S
index 8971b3bee9..863a498213 100644
--- a/extras/mini-os/arch/ia64/ivt.S
+++ b/extras/mini-os/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/extras/mini-os/arch/ia64/mm.c b/extras/mini-os/arch/ia64/mm.c
index c6aef8331f..b171f75dc3 100644
--- a/extras/mini-os/arch/ia64/mm.c
+++ b/extras/mini-os/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/extras/mini-os/arch/ia64/sal.c b/extras/mini-os/arch/ia64/sal.c
index 286e5be38c..7fa7f94acd 100644
--- a/extras/mini-os/arch/ia64/sal.c
+++ b/extras/mini-os/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/extras/mini-os/arch/ia64/sched.c b/extras/mini-os/arch/ia64/sched.c
index 5eea71e077..ae9e661546 100644
--- a/extras/mini-os/arch/ia64/sched.c
+++ b/extras/mini-os/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/extras/mini-os/arch/ia64/time.c b/extras/mini-os/arch/ia64/time.c
index 4a3a558dc3..53412660f7 100644
--- a/extras/mini-os/arch/ia64/time.c
+++ b/extras/mini-os/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/extras/mini-os/arch/ia64/xencomm.c b/extras/mini-os/arch/ia64/xencomm.c
index fccfee2f1e..9719e49f18 100644
--- a/extras/mini-os/arch/ia64/xencomm.c
+++ b/extras/mini-os/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/extras/mini-os/arch/x86/ioremap.c b/extras/mini-os/arch/x86/ioremap.c
index d94f4e72a7..f55d9e078e 100644
--- a/extras/mini-os/arch/x86/ioremap.c
+++ b/extras/mini-os/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/extras/mini-os/arch/x86/mm.c b/extras/mini-os/arch/x86/mm.c
index 723fc567e9..8d688fc25a 100644
--- a/extras/mini-os/arch/x86/mm.c
+++ b/extras/mini-os/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/extras/mini-os/arch/x86/sched.c b/extras/mini-os/arch/x86/sched.c
index 9b98b93a55..8a05b58dcb 100644
--- a/extras/mini-os/arch/x86/sched.c
+++ b/extras/mini-os/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/extras/mini-os/arch/x86/setup.c b/extras/mini-os/arch/x86/setup.c
index 8509079d3e..923901e595 100644
--- a/extras/mini-os/arch/x86/setup.c
+++ b/extras/mini-os/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/extras/mini-os/arch/x86/time.c b/extras/mini-os/arch/x86/time.c
index a55bf59ee6..89bc3826e8 100644
--- a/extras/mini-os/arch/x86/time.c
+++ b/extras/mini-os/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/extras/mini-os/arch/x86/traps.c b/extras/mini-os/arch/x86/traps.c
index f641d90f2e..516d133ec8 100644
--- a/extras/mini-os/arch/x86/traps.c
+++ b/extras/mini-os/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/extras/mini-os/arch/x86/x86_32.S b/extras/mini-os/arch/x86/x86_32.S
index e1426acac0..fb3e30a357 100644
--- a/extras/mini-os/arch/x86/x86_32.S
+++ b/extras/mini-os/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/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os/arch/x86/x86_64.S
index a8b1933da2..a65e5d5d8e 100644
--- a/extras/mini-os/arch/x86/x86_64.S
+++ b/extras/mini-os/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/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c
index bba1a2ffa6..a451e98f02 100644
--- a/extras/mini-os/blkfront.c
+++ b/extras/mini-os/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/extras/mini-os/console/console.c b/extras/mini-os/console/console.c
index 81cedcbd64..1bd0405f4a 100644
--- a/extras/mini-os/console/console.c
+++ b/extras/mini-os/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/extras/mini-os/console/xencons_ring.c b/extras/mini-os/console/xencons_ring.c
index a7a9827c00..3bb408f70a 100644
--- a/extras/mini-os/console/xencons_ring.c
+++ b/extras/mini-os/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/extras/mini-os/events.c b/extras/mini-os/events.c
index c907e652b9..2f359a54e7 100644
--- a/extras/mini-os/events.c
+++ b/extras/mini-os/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/extras/mini-os/fbfront.c b/extras/mini-os/fbfront.c
index 1406de0212..8cf1721975 100644
--- a/extras/mini-os/fbfront.c
+++ b/extras/mini-os/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/extras/mini-os/fs-front.c b/extras/mini-os/fs-front.c
index 7c4d68df5a..dd664caebc 100644
--- a/extras/mini-os/fs-front.c
+++ b/extras/mini-os/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/extras/mini-os/gntmap.c b/extras/mini-os/gntmap.c
index abbd91ab33..22ed450c8c 100644
--- a/extras/mini-os/gntmap.c
+++ b/extras/mini-os/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/extras/mini-os/gnttab.c b/extras/mini-os/gnttab.c
index 9b350523d5..ebfa8ac554 100644
--- a/extras/mini-os/gnttab.c
+++ b/extras/mini-os/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/extras/mini-os/hypervisor.c b/extras/mini-os/hypervisor.c
index dad8b59609..b4688a059a 100644
--- a/extras/mini-os/hypervisor.c
+++ b/extras/mini-os/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/extras/mini-os/kernel.c b/extras/mini-os/kernel.c
index 33c91b59ff..19e4400be4 100644
--- a/extras/mini-os/kernel.c
+++ b/extras/mini-os/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/extras/mini-os/lib/math.c b/extras/mini-os/lib/math.c
index 55ece1ed51..00a13a5004 100644
--- a/extras/mini-os/lib/math.c
+++ b/extras/mini-os/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/extras/mini-os/lib/printf.c b/extras/mini-os/lib/printf.c
index a986616586..833bb96a32 100644
--- a/extras/mini-os/lib/printf.c
+++ b/extras/mini-os/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/extras/mini-os/lib/stack_chk_fail.c b/extras/mini-os/lib/stack_chk_fail.c
index ade0045f0a..05aea20059 100644
--- a/extras/mini-os/lib/stack_chk_fail.c
+++ b/extras/mini-os/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/extras/mini-os/lib/string.c b/extras/mini-os/lib/string.c
index a6f2abe0b0..8b241464e2 100644
--- a/extras/mini-os/lib/string.c
+++ b/extras/mini-os/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/extras/mini-os/lib/xmalloc.c b/extras/mini-os/lib/xmalloc.c
index c33c48ab41..14fe796131 100644
--- a/extras/mini-os/lib/xmalloc.c
+++ b/extras/mini-os/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/extras/mini-os/mm.c b/extras/mini-os/mm.c
index a5338b0053..743d45d051 100644
--- a/extras/mini-os/mm.c
+++ b/extras/mini-os/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/extras/mini-os/netfront.c b/extras/mini-os/netfront.c
index ea092df074..fd1a315b77 100644
--- a/extras/mini-os/netfront.c
+++ b/extras/mini-os/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/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c
index 70ea89b82d..d8a5a946fc 100644
--- a/extras/mini-os/pcifront.c
+++ b/extras/mini-os/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/extras/mini-os/sched.c b/extras/mini-os/sched.c
index b1e1d288b8..c0229c5687 100644
--- a/extras/mini-os/sched.c
+++ b/extras/mini-os/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/extras/mini-os/xenbus/xenbus.c b/extras/mini-os/xenbus/xenbus.c
index 958e010dab..916a389644 100644
--- a/extras/mini-os/xenbus/xenbus.c
+++ b/extras/mini-os/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); \