[PATCH] stubdom/minios: re-structure headers part 1/2

[PATCH] stubdom/minios: re-structure headers part 1/2

[Christoph Egger]

[-- Attachment #1: Type: text/plain, Size: 704 bytes --]


Hi!

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

The two patches change the include path, first one in xen-tree, second one
in ioemu tree. It is necessary to have both upstream *before* the real header
restructuring or build breaks, otherwise.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

[-- Attachment #2: xen_stubdom_include.diff --]
[-- Type: text/x-diff, Size: 24063 bytes --]

diff -r 6472342c8ab0 extras/mini-os/arch/ia64/common.c
--- a/extras/mini-os/arch/ia64/common.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/ia64/common.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/ia64/debug.c
--- a/extras/mini-os/arch/ia64/debug.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/ia64/debug.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/ia64/efi.c
--- a/extras/mini-os/arch/ia64/efi.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/ia64/efi.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/ia64/fw.S
--- a/extras/mini-os/arch/ia64/fw.S	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/ia64/fw.S	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/ia64/gen_off.c
--- a/extras/mini-os/arch/ia64/gen_off.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/ia64/gen_off.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/ia64/ia64.S
--- a/extras/mini-os/arch/ia64/ia64.S	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/ia64/ia64.S	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/ia64/ivt.S
--- a/extras/mini-os/arch/ia64/ivt.S	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/ia64/ivt.S	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/ia64/mm.c
--- a/extras/mini-os/arch/ia64/mm.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/ia64/mm.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/ia64/sal.c
--- a/extras/mini-os/arch/ia64/sal.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/ia64/sal.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/ia64/sched.c
--- a/extras/mini-os/arch/ia64/sched.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/ia64/sched.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/ia64/time.c
--- a/extras/mini-os/arch/ia64/time.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/ia64/time.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/ia64/xencomm.c
--- a/extras/mini-os/arch/ia64/xencomm.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/ia64/xencomm.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/x86/ioremap.c
--- a/extras/mini-os/arch/x86/ioremap.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/x86/ioremap.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/x86/mm.c
--- a/extras/mini-os/arch/x86/mm.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/x86/mm.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/x86/sched.c
--- a/extras/mini-os/arch/x86/sched.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/x86/sched.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/x86/setup.c
--- a/extras/mini-os/arch/x86/setup.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/x86/setup.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/x86/time.c
--- a/extras/mini-os/arch/x86/time.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/x86/time.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/x86/traps.c
--- a/extras/mini-os/arch/x86/traps.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/x86/traps.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/x86/x86_32.S
--- a/extras/mini-os/arch/x86/x86_32.S	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/x86/x86_32.S	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/arch/x86/x86_64.S
--- a/extras/mini-os/arch/x86/x86_64.S	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/arch/x86/x86_64.S	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/blkfront.c
--- a/extras/mini-os/blkfront.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/blkfront.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/console/console.c
--- a/extras/mini-os/console/console.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/console/console.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/console/xencons_ring.c
--- a/extras/mini-os/console/xencons_ring.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/console/xencons_ring.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/events.c
--- a/extras/mini-os/events.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/events.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/fbfront.c
--- a/extras/mini-os/fbfront.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/fbfront.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/fs-front.c
--- a/extras/mini-os/fs-front.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/fs-front.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/gntmap.c
--- a/extras/mini-os/gntmap.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/gntmap.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/gnttab.c
--- a/extras/mini-os/gnttab.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/gnttab.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/hypervisor.c
--- a/extras/mini-os/hypervisor.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/hypervisor.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/kernel.c
--- a/extras/mini-os/kernel.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/kernel.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/lib/math.c
--- a/extras/mini-os/lib/math.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/lib/math.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/lib/printf.c
--- a/extras/mini-os/lib/printf.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/lib/printf.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/lib/stack_chk_fail.c
--- a/extras/mini-os/lib/stack_chk_fail.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/lib/stack_chk_fail.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/lib/string.c
--- a/extras/mini-os/lib/string.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/lib/string.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/lib/xmalloc.c
--- a/extras/mini-os/lib/xmalloc.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/lib/xmalloc.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/mm.c
--- a/extras/mini-os/mm.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/mm.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/netfront.c
--- a/extras/mini-os/netfront.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/netfront.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/pcifront.c
--- a/extras/mini-os/pcifront.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/pcifront.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/sched.c
--- a/extras/mini-os/sched.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/sched.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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 -r 6472342c8ab0 extras/mini-os/xenbus/xenbus.c
--- a/extras/mini-os/xenbus/xenbus.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/extras/mini-os/xenbus/xenbus.c	Wed Sep 30 12:21:57 2009 +0200
@@ -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);                 \
diff -r 6472342c8ab0 tools/libxc/xc_minios.c
--- a/tools/libxc/xc_minios.c	Wed Sep 30 08:51:21 2009 +0100
+++ b/tools/libxc/xc_minios.c	Wed Sep 30 12:21:57 2009 +0200
@@ -11,13 +11,13 @@
  */
 
 #undef NDEBUG
-#include <types.h>
-#include <os.h>
-#include <mm.h>
-#include <lib.h>
-#include <gntmap.h>
-#include <events.h>
-#include <wait.h>
+#include <mini-os/types.h>
+#include <mini-os/os.h>
+#include <mini-os/mm.h>
+#include <mini-os/lib.h>
+#include <mini-os/gntmap.h>
+#include <mini-os/events.h>
+#include <mini-os/wait.h>
 #include <sys/mman.h>
 #include <errno.h>
 

[-- Attachment #3: xen_ioemu_stubdom_include.diff --]
[-- Type: text/x-diff, Size: 983 bytes --]

diff --git a/block-vbd.c b/block-vbd.c
index 56794f6..11ac4d0 100644
--- a/block-vbd.c
+++ b/block-vbd.c
@@ -26,8 +26,8 @@
 #include "sys-queue.h"
 #include "block_int.h"
 #include <assert.h>
-#include <xenbus.h>
-#include <blkfront.h>
+#include <mini-os/xenbus.h>
+#include <mini-os/blkfront.h>
 #include <malloc.h>
 #include "qemu-char.h"
 
diff --git a/qemu-lock.h b/qemu-lock.h
index 6778eea..3a01ebe 100644
--- a/qemu-lock.h
+++ b/qemu-lock.h
@@ -34,7 +34,7 @@
 
 #elif defined(CONFIG_STUBDOM)
 
-#include <spinlock.h>
+#include <mini-os/spinlock.h>
 
 #else
 
diff --git a/xenfbfront.c b/xenfbfront.c
index ed79cde..ec1f309 100644
--- a/xenfbfront.c
+++ b/xenfbfront.c
@@ -1,9 +1,9 @@
 #include <stdint.h>
 #include <xen/io/fbif.h>
 #include <xen/io/kbdif.h>
-#include <semaphore.h>
-#include <sched.h>
-#include <fbfront.h>
+#include <mini-os/semaphore.h>
+#include <mini-os/sched.h>
+#include <mini-os/fbfront.h>
 #include <hw/hw.h>
 #include <hw/pc.h>
 #include <console.h>

[-- Attachment #4: Type: text/plain, Size: 138 bytes --]

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

Re: [PATCH] stubdom/minios: re-structure headers part 1/2

[Keir Fraser]

On 30/09/2009 11:39, "Christoph Egger" <Christoph.Egger@amd.com> wrote:

> As part of making stubdom usable on NetBSD, it is necessary to restructure
> the minios headers to avoid conflicts with NetBSD's crossbuild toolchain.
> 
> The two patches change the include path, first one in xen-tree, second one
> in ioemu tree. It is necessary to have both upstream *before* the real header
> restructuring or build breaks, otherwise.

Just a note that any minios/stubdom changes need an emailed Ack from Stefano
or Samuel, of course.

 -- Keir

Re: [PATCH] stubdom/minios: re-structure headers part 1/2

[Samuel Thibault]

Christoph Egger, le Wed 30 Sep 2009 12:39:18 +0200, a écrit :
> The two patches change the include path, first one in xen-tree, second one
> in ioemu tree. It is necessary to have both upstream *before* the real header
> restructuring or build breaks, otherwise.

Acked.

Samuel

Re: [PATCH] stubdom/minios: re-structure headers part 1/2

[Keir Fraser]

On 30/09/2009 11:39, "Christoph Egger" <Christoph.Egger@amd.com> wrote:

> The two patches change the include path, first one in xen-tree, second one
> in ioemu tree. It is necessary to have both upstream *before* the real header
> restructuring or build breaks, otherwise.

Do both patches need to be applied at the same time? Can I check in the Xen
patch before the qemu patch, or will that break the build?

 -- Keir

Re: [PATCH] stubdom/minios: re-structure headers part 1/2

[Christoph Egger]

On Wednesday 30 September 2009 15:56:09 Keir Fraser wrote:
> On 30/09/2009 11:39, "Christoph Egger" <Christoph.Egger@amd.com> wrote:
> > The two patches change the include path, first one in xen-tree, second
> > one in ioemu tree. It is necessary to have both upstream *before* the
> > real header restructuring or build breaks, otherwise.
>
> Do both patches need to be applied at the same time? Can I check in the Xen
> patch before the qemu patch, or will that break the build?

The two patches can be applied independent from each other.

I haven't submitted the patch yet which does the real header restructuring.
That one depends on having both patches applied first to not break the build.

Christoph


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632