Skip to contentSkip to conversation

stubdom/minios: re-structure headers part 1/2

PATCH In review Christoph Egger 3 participants 5 messages Sep 30, 2009

lore
Share & tools
lore
#0 lore raw

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

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.

Signature · 6 lines
---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
extras/mini-os/arch/ia64/common.c +13 -13
diff -r 6472342c8ab0 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. */
extras/mini-os/arch/ia64/debug.c +1 -1
diff -r 6472342c8ab0 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 */
extras/mini-os/arch/ia64/efi.c +5 -5
diff -r 6472342c8ab0 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. */
extras/mini-os/arch/ia64/fw.S +6 -6
diff -r 6472342c8ab0 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>
 
 
 /*
extras/mini-os/arch/ia64/gen_off.c +4 -4
diff -r 6472342c8ab0 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))
extras/mini-os/arch/ia64/ia64.S +6 -6
diff -r 6472342c8ab0 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>
 
 
 
extras/mini-os/arch/ia64/ivt.S +5 -5
diff -r 6472342c8ab0 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:
extras/mini-os/arch/ia64/mm.c +2 -2
diff -r 6472342c8ab0 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
extras/mini-os/arch/ia64/sal.c +4 -4
diff -r 6472342c8ab0 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;
extras/mini-os/arch/ia64/sched.c +5 -5
diff -r 6472342c8ab0 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);
extras/mini-os/arch/ia64/time.c +5 -5
diff -r 6472342c8ab0 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. */
extras/mini-os/arch/ia64/xencomm.c +2 -2
diff -r 6472342c8ab0 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>
 
extras/mini-os/arch/x86/ioremap.c +5 -5
diff -r 6472342c8ab0 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. */
extras/mini-os/arch/x86/mm.c +6 -6
diff -r 6472342c8ab0 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
extras/mini-os/arch/x86/sched.c +10 -10
diff -r 6472342c8ab0 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
extras/mini-os/arch/x86/setup.c +2 -2
diff -r 6472342c8ab0 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.
extras/mini-os/arch/x86/time.c +7 -7
diff -r 6472342c8ab0 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
extras/mini-os/arch/x86/traps.c +6 -6
diff -r 6472342c8ab0 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.
extras/mini-os/arch/x86/x86_32.S +2 -2
diff -r 6472342c8ab0 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
extras/mini-os/arch/x86/x86_64.S +2 -2
diff -r 6472342c8ab0 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
extras/mini-os/blkfront.c +8 -7
diff -r 6472342c8ab0 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
extras/mini-os/console/console.c +8 -8
diff -r 6472342c8ab0 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>
 
 
extras/mini-os/console/xencons_ring.c +10 -10
diff -r 6472342c8ab0 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);
 
extras/mini-os/events.c +5 -5
diff -r 6472342c8ab0 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
 
extras/mini-os/fbfront.c +7 -7
diff -r 6472342c8ab0 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);
 
extras/mini-os/fs-front.c +9 -8
diff -r 6472342c8ab0 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()
extras/mini-os/gntmap.c +4 -3
diff -r 6472342c8ab0 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
 
extras/mini-os/gnttab.c +4 -4
diff -r 6472342c8ab0 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
 
extras/mini-os/hypervisor.c +4 -3
diff -r 6472342c8ab0 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] &                \
extras/mini-os/kernel.c +16 -16
diff -r 6472342c8ab0 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>
extras/mini-os/lib/math.c +3 -3
diff -r 6472342c8ab0 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. */
extras/mini-os/lib/printf.c +7 -7
diff -r 6472342c8ab0 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
extras/mini-os/lib/stack_chk_fail.c +2 -2
diff -r 6472342c8ab0 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)
 {
extras/mini-os/lib/string.c +4 -4
diff -r 6472342c8ab0 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)
 {
extras/mini-os/lib/xmalloc.c +6 -6
diff -r 6472342c8ab0 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);
extras/mini-os/mm.c +6 -6
diff -r 6472342c8ab0 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...) \
extras/mini-os/netfront.c +9 -9
diff -r 6472342c8ab0 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);
 
extras/mini-os/pcifront.c +9 -7
diff -r 6472342c8ab0 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))
 
extras/mini-os/sched.c +10 -10
diff -r 6472342c8ab0 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
extras/mini-os/xenbus/xenbus.c +11 -11
diff -r 6472342c8ab0 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);                 \
tools/libxc/xc_minios.c +7 -7
diff -r 6472342c8ab0 tools/libxc/xc_minios.c
@@ -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>
 
block-vbd.c +2 -2
index 56794f6..11ac4d0 100644
@@ -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"
 
qemu-lock.h +1 -1
index 6778eea..3a01ebe 100644
@@ -34,7 +34,7 @@
 
 #elif defined(CONFIG_STUBDOM)
 
-#include <spinlock.h>
+#include <mini-os/spinlock.h>
 
 #else
 
xenfbfront.c +3 -3
index ed79cde..ec1f309 100644
@@ -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>

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw
Quoted 6 lines · Christoph Egger

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

#2 lore raw
In reply to Christoph Egger
Quoted 3 lines · 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

#3 lore raw
In reply to Christoph Egger
Quoted 3 lines · Christoph Egger

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

#4 lore raw
Quoted 7 lines · On Wednesday 30 September 2009 15:56:09 Keir Fraser wrote:
Quoted 3 lines · Christoph Egger

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

Signature · 6 lines
---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