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>

8 files changed, 40 insertions, 40 deletions

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