Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Oct 2008 06:31:32 +0000 (UTC)
From:      Kip Macy <kmacy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r184020 - projects/release_6_3_xen/sys/conf
Message-ID:  <200810180631.m9I6VW77009147@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kmacy
Date: Sat Oct 18 06:31:32 2008
New Revision: 184020
URL: http://svn.freebsd.org/changeset/base/184020

Log:
  add xen support to the config

Modified:
  projects/release_6_3_xen/sys/conf/files
  projects/release_6_3_xen/sys/conf/files.i386
  projects/release_6_3_xen/sys/conf/kern.pre.mk
  projects/release_6_3_xen/sys/conf/options.i386

Modified: projects/release_6_3_xen/sys/conf/files
==============================================================================
--- projects/release_6_3_xen/sys/conf/files	Sat Oct 18 06:30:33 2008	(r184019)
+++ projects/release_6_3_xen/sys/conf/files	Sat Oct 18 06:31:32 2008	(r184020)
@@ -1998,3 +1998,18 @@ vm/vm_pager.c			standard
 vm/vm_unix.c			standard
 vm/vm_zeroidle.c		standard
 vm/vnode_pager.c		standard
+
+xen/gnttab.c                   optional xen
+xen/features.c                 optional xen
+xen/evtchn/evtchn.c            optional xen
+xen/evtchn/evtchn_dev.c                optional xen
+xen/xenbus/xenbus_client.c     optional xen
+xen/xenbus/xenbus_comms.c      optional xen
+xen/xenbus/xenbus_dev.c                optional xen
+xen/xenbus/xenbus_probe.c      optional xen
+xen/xenbus/xenbus_probe_backend.c      optional xen
+xen/xenbus/xenbus_xs.c         optional xen
+dev/xen/console/console.c      optional xen
+dev/xen/console/xencons_ring.c optional xen
+dev/xen/blkfront/blkfront.c    optional xen
+dev/xen/netfront/netfront.c    optional xen

Modified: projects/release_6_3_xen/sys/conf/files.i386
==============================================================================
--- projects/release_6_3_xen/sys/conf/files.i386	Sat Oct 18 06:30:33 2008	(r184019)
+++ projects/release_6_3_xen/sys/conf/files.i386	Sat Oct 18 06:31:32 2008	(r184020)
@@ -288,8 +288,8 @@ i386/cpufreq/smist.c		optional cpufreq
 i386/i386/atomic.c		standard				\
 	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
 i386/i386/autoconf.c		standard
-i386/i386/bios.c		standard
-i386/i386/bioscall.s		standard
+i386/i386/bios.c		optional native
+i386/i386/bioscall.s		optional native	
 i386/i386/busdma_machdep.c	standard
 i386/i386/db_disasm.c		optional ddb
 i386/i386/db_interface.c	optional ddb
@@ -298,7 +298,8 @@ i386/i386/dump_machdep.c	standard
 i386/i386/elan-mmcr.c		optional cpu_elan
 i386/i386/elan-mmcr.c		optional cpu_soekris
 i386/i386/elf_machdep.c		standard
-i386/i386/exception.s		standard
+i386/i386/exception.s		optional native
+i386/xen/exception.s		optional xen
 i386/i386/gdb_machdep.c		optional gdb
 i386/i386/geode.c		optional cpu_geode
 i386/i386/i686_mem.c		optional mem
@@ -311,22 +312,26 @@ i386/i386/io_apic.c		optional apic
 i386/i386/k6_mem.c		optional mem
 i386/i386/legacy.c		standard
 i386/i386/local_apic.c		optional apic
-i386/i386/locore.s		standard	no-obj
+i386/i386/locore.s		optional native	no-obj
+i386/xen/locore.s		optional xen	no-obj
 i386/i386/longrun.c		optional cpu_enable_longrun
 i386/i386/machdep.c		standard
 i386/i386/mem.c			optional mem
 i386/i386/minidump_machdep.c	standard
 i386/i386/mp_clock.c		optional smp
-i386/i386/mp_machdep.c		optional smp
+i386/i386/mp_machdep.c		optional native smp
+i386/xen/mp_machdep.c		optional xen smp
 i386/i386/mp_watchdog.c		optional mp_watchdog smp
-i386/i386/mpboot.s		optional smp
+i386/i386/mpboot.s		optional native smp
 i386/i386/mptable.c		optional apic
 i386/i386/mptable_pci.c		optional apic pci
 i386/i386/msi.c			optional apic pci
 i386/i386/nexus.c		standard
 i386/i386/perfmon.c		optional perfmon
 i386/i386/perfmon.c		optional perfmon	profiling-routine
-i386/i386/pmap.c		standard
+i386/i386/pmap.c		optional native
+i386/xen/pmap.c			optional xen
+i386/xen/xen_machdep.c		optional xen
 i386/i386/ptrace_machdep.c	standard
 i386/i386/support.s		standard
 i386/i386/swtch.s		standard
@@ -355,9 +360,10 @@ i386/ibcs2/ibcs2_util.c		optional ibcs2
 i386/ibcs2/ibcs2_xenix.c	optional ibcs2
 i386/ibcs2/ibcs2_xenix_sysent.c	optional ibcs2
 i386/ibcs2/imgact_coff.c	optional ibcs2
-i386/isa/atpic.c		standard
+i386/isa/atpic.c		optional atpic
 #i386/isa/atpic_vector.s		standard
-i386/isa/clock.c		standard
+i386/isa/clock.c		optional native
+i386/xen/clock.c		optional xen
 i386/isa/elcr.c			standard
 i386/isa/elink.c		optional ep
 i386/isa/elink.c		optional ie

Modified: projects/release_6_3_xen/sys/conf/kern.pre.mk
==============================================================================
--- projects/release_6_3_xen/sys/conf/kern.pre.mk	Sat Oct 18 06:30:33 2008	(r184019)
+++ projects/release_6_3_xen/sys/conf/kern.pre.mk	Sat Oct 18 06:31:32 2008	(r184020)
@@ -70,6 +70,9 @@ INCLUDES+= -I$S/dev/twa
 # .. and the same for em
 INCLUDES+= -I$S/dev/em
 
+INCLUDES+= -I$S/xen/interface -I$S/xen/interface/io
+
+
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG}
 CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
 .if ${CC} != "icc"

Modified: projects/release_6_3_xen/sys/conf/options.i386
==============================================================================
--- projects/release_6_3_xen/sys/conf/options.i386	Sat Oct 18 06:30:33 2008	(r184019)
+++ projects/release_6_3_xen/sys/conf/options.i386	Sat Oct 18 06:31:32 2008	(r184020)
@@ -163,3 +163,6 @@ ASR_COMPAT		opt_asr.h
 # Debugging
 KDB_STOP_NMI		opt_kdb.h
 NPX_DEBUG		opt_npx.h
+
+NATIVE			opt_global.h
+XEN			opt_global.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810180631.m9I6VW77009147>