diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-07-10 14:15:46 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-07-10 14:15:46 +0100 |
| commit | 8f969983389d428de381469944712e468f99e345 (patch) | |
| tree | a61f39a4b60205164f696e0d3222fd3019965582 /extras/mini-os/include/x86 | |
| parent | 79961b311e61cb274d817d15e073ad511918a36e (diff) | |
| download | xen-8f969983389d428de381469944712e468f99e345.tar.gz xen-8f969983389d428de381469944712e468f99e345.tar.bz2 xen-8f969983389d428de381469944712e468f99e345.zip | |
stubdom: fixes to compile with qemu-xen
This adds fixes to the stub domain build into compiling Ian Jackson's
qemu-xen. The most notable change is that mini-os headers now
#include each other through a mini-os/ prefix, so that we can turn all
-I into -isystem and still be sure that we include Mini-OS headers
(and not qemu's console.h or blktaplib's list.h for instance...).
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Diffstat (limited to 'extras/mini-os/include/x86')
| -rw-r--r-- | extras/mini-os/include/x86/arch_sched.h | 2 | ||||
| -rw-r--r-- | extras/mini-os/include/x86/arch_spinlock.h | 2 | ||||
| -rw-r--r-- | extras/mini-os/include/x86/os.h | 6 | ||||
| -rw-r--r-- | extras/mini-os/include/x86/x86_32/hypercall-x86_32.h | 2 | ||||
| -rw-r--r-- | extras/mini-os/include/x86/x86_64/hypercall-x86_64.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/extras/mini-os/include/x86/arch_sched.h b/extras/mini-os/include/x86/arch_sched.h index d80323cd37..b494ecaf4a 100644 --- a/extras/mini-os/include/x86/arch_sched.h +++ b/extras/mini-os/include/x86/arch_sched.h @@ -2,7 +2,7 @@ #ifndef __ARCH_SCHED_H__ #define __ARCH_SCHED_H__ -#include <arch_limits.h> +#include "arch_limits.h" static inline struct thread* get_current(void) { diff --git a/extras/mini-os/include/x86/arch_spinlock.h b/extras/mini-os/include/x86/arch_spinlock.h index 59c2fb9b26..4b8faf75a8 100644 --- a/extras/mini-os/include/x86/arch_spinlock.h +++ b/extras/mini-os/include/x86/arch_spinlock.h @@ -3,7 +3,7 @@ #ifndef __ARCH_ASM_SPINLOCK_H #define __ARCH_ASM_SPINLOCK_H -#include <lib.h> +#include <mini-os/lib.h> #include "os.h" diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os/include/x86/os.h index 39faa0395d..248105f13c 100644 --- a/extras/mini-os/include/x86/os.h +++ b/extras/mini-os/include/x86/os.h @@ -16,9 +16,9 @@ #ifndef __ASSEMBLY__ -#include <types.h> -#include <hypervisor.h> -#include <kernel.h> +#include <mini-os/types.h> +#include <mini-os/hypervisor.h> +#include <mini-os/kernel.h> #define USED __attribute__ ((used)) diff --git a/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h b/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h index e11010b413..d5f5b1e713 100644 --- a/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h +++ b/extras/mini-os/include/x86/x86_32/hypercall-x86_32.h @@ -33,7 +33,7 @@ #include <xen/xen.h> #include <xen/sched.h> #include <xen/nmi.h> -#include <mm.h> +#include <mini-os/mm.h> #define __STR(x) #x #define STR(x) __STR(x) diff --git a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h index 179b776ed5..32ea5bd611 100644 --- a/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h +++ b/extras/mini-os/include/x86/x86_64/hypercall-x86_64.h @@ -36,7 +36,7 @@ #include <xen/xen.h> #include <xen/sched.h> -#include <mm.h> +#include <mini-os/mm.h> #define __STR(x) #x #define STR(x) __STR(x) |