Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/xen/conf/files.xen,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/xen/conf/files.xen,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -p -r1.25.2.1 -r1.25.2.2
--- src/sys/arch/xen/conf/files.xen	2006/06/21 14:58:06	1.25.2.1
+++ src/sys/arch/xen/conf/files.xen	2006/12/30 20:47:24	1.25.2.2
@@ -1,4 +1,4 @@
-#	$NetBSD: files.xen,v 1.25.2.1 2006/06/21 14:58:06 yamt Exp $
+#	$NetBSD: files.xen,v 1.25.2.2 2006/12/30 20:47:24 yamt Exp $
 #	NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp 
 #	NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp 
 
@@ -11,6 +11,9 @@ defparam opt_kernbase.h	KERNBASE
 # Processor type options.
 defflag	opt_cputype.h	I686_CPU
 
+# options for MP configuration through the MP spec
+defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
+
 # delay before cpu_reset() for reboot.
 defparam		CPURESET_DELAY
 
@@ -105,6 +108,10 @@ file	arch/x86/x86/x86_machdep.c
 
 include	"arch/xen/conf/files.compat"
 
+# BIOS32 routines
+define  bios32
+file	arch/xen/i386/bios32.c		bios32 needs-flag
+
 # i386 specific mainbus attributes
 define cpubus { [apid = -1] }
 define apmbus {}
@@ -112,19 +119,21 @@ define pnpbiosbus {}
 define vesabiosbus {}  
 define hypervisorbus {}
 define xendevbus {}
+define ipmibus {}
 
 #
 # System bus types
 #
 
-device mainbus: cpubus, hypervisorbus
+device mainbus: cpubus, hypervisorbus, bios32, ipmibus
 attach	mainbus at root
 file	arch/xen/i386/mainbus.c		mainbus
 
 # Xen hypervisor
-device	hypervisor { }: isabus, pcibus, sysmon_power, xendevbus, acpibus
+device	hypervisor { [apid = -1]}: isabus, pcibus, sysmon_power, xendevbus, acpibus
 attach hypervisor at hypervisorbus
 file	arch/xen/xen/hypervisor.c	hypervisor needs-flag
+file	arch/xen/xen/shutdown_xenbus.c	hypervisor & xen3
 
 # Xenbus (xen3 only)
 device xenbus {[id = -1]}
@@ -150,6 +159,7 @@ file	arch/xen/xen/xencons.c		xencons nee
 # Xen event peudo-device
 defpseudo xenevt
 defpseudo xvif
+defpseudo xbdback
 
 # Xen Network driver
 device	xennet: arp, ether, ifnet
@@ -180,7 +190,7 @@ include	"dev/pckbport/files.pckbport"
 include "dev/i2o/files.i2o"
 include "dev/pci/files.pci"
 include "dev/pci/files.agp"
-file 	arch/i386/pci/agp_machdep.c	agp
+file 	arch/x86/pci/agp_machdep.c	agp
 file	arch/xen/xen/pciide_machdep.c	pciide_common
 
 #
@@ -194,14 +204,31 @@ include "dev/ieee1394/files.ieee1394"
 
 device  fdc {drive = -1} #XXX
 
+include "dev/apm/files.apm"
+
 include "dev/acpi/files.acpi"
 file	arch/xen/xen/xen_acpi_machdep.c	acpi
+file	arch/x86/x86/mpacpi.c		acpi
 file	arch/x86/x86/acpi_machdep.c	acpi
-file	arch/x86/x86/i8259.c		acpi
+file	arch/x86/x86/i8259.c		xen3
+
+# MP configuration using Intel SMP specification 1.4
+file	arch/x86/x86/mpbios.c		mpbios
 
 file    arch/i386/pci/pci_bus_fixup.c   pci_bus_fixup
 file    arch/i386/pci/pci_addr_fixup.c  pci_addr_fixup
 
+file	arch/x86/x86/apic.c		ioapic
+
+device ioapic
+attach ioapic at cpubus
+file	arch/x86/x86/ioapic.c		ioapic needs-flag
+
+#IPMI device
+device ipmi : sysmon_envsys, sysmon_wdog
+attach ipmi at ipmibus
+file	arch/x86/x86/ipmi.c		ipmi needs-flag
+
 # PCI-Host bridge chipsets
 device	pchb: pcibus, agpbus, agp_ali, agp_amd, agp_i810, agp_intel, agp_sis,
 	      agp_via
@@ -218,7 +245,11 @@ file    arch/xen/xen/pcib.c            p
 
 device cpu
 attach cpu at cpubus
-file	arch/xen/i386/cpu.c		cpu
+
+device vcpu
+attach vcpu at xendevbus
+
+file	arch/xen/i386/cpu.c		cpu | vcpu
 
 #
 # Compatibility modules
@@ -232,7 +263,7 @@ file	arch/i386/i386/kvm86.c			kvm86
 file	arch/i386/i386/kvm86call.S		kvm86
 
 # Binary compatibility with previous NetBSD releases (COMPAT_XX)
-file	arch/i386/i386/compat_13_machdep.c	compat_13 | compat_aout
+file	arch/i386/i386/compat_13_machdep.c	compat_13
 file	arch/i386/i386/compat_16_machdep.c	compat_16 | compat_ibcs2
 
 # SVR4 binary compatibility (COMPAT_SVR4)
@@ -277,6 +308,9 @@ include	"compat/pecoff/files.pecoff"
 # OSS audio driver compatibility
 include	"compat/ossaudio/files.ossaudio"
 
+# Bluetooth
+include "dev/bluetooth/files.bluetooth"
+
 #
 # CARDBUS
 #
@@ -290,7 +324,7 @@ file	arch/i386/i386/rbus_machdep.c	cardb
 include	"dev/pcmcia/files.pcmcia"
 
 # Domain-0 operations
-defflag	opt_xen.h			DOM0OPS
+defflag	opt_xen.h			DOM0OPS XEN_COMPAT_030001
 file	arch/xen/xen/privcmd.c		dom0ops
 file 	arch/xen/i386/xen_shm_machdep.c	dom0ops | xen3
 file	arch/xen/xen/xbdback.c		dom0ops & !xen3
@@ -301,5 +335,7 @@ file	arch/xen/xen/pci_intr_machdep.c	hyp
 file	arch/xen/xen/isa_machdep.c	hypervisor & dom0ops
 file	arch/xen/xen/xenevt.c		xenevt & dom0ops
 file	arch/xen/xen/xennetback_xenbus.c xvif & xen3
+file	arch/xen/xen/xennet_checksum.c	(xvif & xen3) | xennet_xenbus
+file	arch/xen/xen/xbdback_xenbus.c xbdback & xen3
 
 include "arch/i386/conf/majors.i386"