Module Name:	src
Committed By:	bouyer
Date:		Wed Mar  9 22:39:21 UTC 2005

Modified Files:
	src/sys/arch/xen: Makefile
	src/sys/arch/xen/conf: XEN files.compat files.xen majors.xen
	src/sys/arch/xen/i386: autoconf.c gdt.c hypervisor_machdep.c identcpu.c
	    locore.S machdep.c pmap.c spl.S sys_machdep.c trap.c vector.S
	    xen_machdep.c
	src/sys/arch/xen/include: cpufunc.h frameasm.h hypervisor.h
	    if_xennetvar.h pmap.h xbdvar.h xen.h xenfunc.h xenio.h xenpmap.h
	src/sys/arch/xen/x86: bus_space.c consinit.c intr.c
	src/sys/arch/xen/xen: clock.c hypervisor.c if_xennet.c privcmd.c xbd.c
	    xen_debug.c xencons.c
Added Files:
	src/sys/arch/xen/conf: XEN-INSTALL XEN0
	src/sys/arch/xen/i386: xen_shm_machdep.c
	src/sys/arch/xen/include: bus.h ctrl_if.h evtchn.h isa_machdep.h
	    pci_machdep.h xen_shm.h
	src/sys/arch/xen/include/xen-public: arch-x86_32.h arch-x86_64.h
	    dom0_ops.h event_channel.h grant_table.h physdev.h sched_ctl.h
	    trace.h xen.h
	src/sys/arch/xen/include/xen-public/io: blkif.h domain_controller.h
	    netif.h
	src/sys/arch/xen/x86: bus_dma.c
	src/sys/arch/xen/xen: ctrl_if.c evtchn.c isa_machdep.c pci_machdep.c
	    pcib.c pciide_machdep.c xbdback.c xenevt.c xennetback.c
Removed Files:
	src/sys/arch/xen/conf: GENERIC GENERIC.local
	src/sys/arch/xen/include: events.h vga_xenvar.h xenkbcvar.h
	src/sys/arch/xen/include/hypervisor-ifs: block.h dom0_ops.h
	    dom_mem_ops.h hypervisor-if.h kbd.h network.h vbd.h
	src/sys/arch/xen/stand: Makefile
	src/sys/arch/xen/stand/xen12load: Makefile loadelf.c start.S xenload.c
	    xenload.h
	src/sys/arch/xen/xen: events.c machmem.c

Log Message:
Merge the bouyer-xen2 branch. This add supports for the Xen 2.0 virtual
machine kernel (both privileged and non-privileged domains), and remove support
for the old xen 1.2.


To generate a diff of this commit:
cvs rdiff -r1.1 -r1.2 src/sys/arch/xen/Makefile
cvs rdiff -r1.24 -r0 src/sys/arch/xen/conf/GENERIC
cvs rdiff -r1.1 -r0 src/sys/arch/xen/conf/GENERIC.local
cvs rdiff -r1.18 -r1.19 src/sys/arch/xen/conf/XEN
cvs rdiff -r0 -r1.2 src/sys/arch/xen/conf/XEN-INSTALL \
    src/sys/arch/xen/conf/XEN0
cvs rdiff -r1.4 -r1.5 src/sys/arch/xen/conf/files.compat
cvs rdiff -r1.16 -r1.17 src/sys/arch/xen/conf/files.xen
cvs rdiff -r1.3 -r1.4 src/sys/arch/xen/conf/majors.xen
cvs rdiff -r1.8 -r1.9 src/sys/arch/xen/i386/autoconf.c \
    src/sys/arch/xen/i386/locore.S
cvs rdiff -r1.1 -r1.2 src/sys/arch/xen/i386/gdt.c \
    src/sys/arch/xen/i386/sys_machdep.c
cvs rdiff -r1.3 -r1.4 src/sys/arch/xen/i386/hypervisor_machdep.c \
    src/sys/arch/xen/i386/identcpu.c
cvs rdiff -r1.11 -r1.12 src/sys/arch/xen/i386/machdep.c
cvs rdiff -r1.7 -r1.8 src/sys/arch/xen/i386/pmap.c
cvs rdiff -r1.2 -r1.3 src/sys/arch/xen/i386/spl.S
cvs rdiff -r1.4 -r1.5 src/sys/arch/xen/i386/trap.c \
    src/sys/arch/xen/i386/vector.S
cvs rdiff -r1.5 -r1.6 src/sys/arch/xen/i386/xen_machdep.c
cvs rdiff -r0 -r1.2 src/sys/arch/xen/i386/xen_shm_machdep.c
cvs rdiff -r0 -r1.2 src/sys/arch/xen/include/bus.h \
    src/sys/arch/xen/include/ctrl_if.h src/sys/arch/xen/include/evtchn.h \
    src/sys/arch/xen/include/isa_machdep.h \
    src/sys/arch/xen/include/pci_machdep.h src/sys/arch/xen/include/xen_shm.h
cvs rdiff -r1.4 -r1.5 src/sys/arch/xen/include/cpufunc.h
cvs rdiff -r1.3 -r0 src/sys/arch/xen/include/events.h
cvs rdiff -r1.1 -r1.2 src/sys/arch/xen/include/frameasm.h \
    src/sys/arch/xen/include/xenio.h
cvs rdiff -r1.9 -r1.10 src/sys/arch/xen/include/hypervisor.h \
    src/sys/arch/xen/include/xen.h
cvs rdiff -r1.3 -r1.4 src/sys/arch/xen/include/if_xennetvar.h \
    src/sys/arch/xen/include/pmap.h src/sys/arch/xen/include/xenfunc.h \
    src/sys/arch/xen/include/xenpmap.h
cvs rdiff -r1.2 -r0 src/sys/arch/xen/include/vga_xenvar.h
cvs rdiff -r1.6 -r1.7 src/sys/arch/xen/include/xbdvar.h
cvs rdiff -r1.1 -r0 src/sys/arch/xen/include/xenkbcvar.h
cvs rdiff -r1.2 -r0 src/sys/arch/xen/include/hypervisor-ifs/block.h
cvs rdiff -r1.1 -r0 src/sys/arch/xen/include/hypervisor-ifs/dom0_ops.h \
    src/sys/arch/xen/include/hypervisor-ifs/dom_mem_ops.h \
    src/sys/arch/xen/include/hypervisor-ifs/hypervisor-if.h \
    src/sys/arch/xen/include/hypervisor-ifs/kbd.h \
    src/sys/arch/xen/include/hypervisor-ifs/network.h \
    src/sys/arch/xen/include/hypervisor-ifs/vbd.h
cvs rdiff -r0 -r1.2 src/sys/arch/xen/include/xen-public/arch-x86_32.h \
    src/sys/arch/xen/include/xen-public/arch-x86_64.h \
    src/sys/arch/xen/include/xen-public/dom0_ops.h \
    src/sys/arch/xen/include/xen-public/event_channel.h \
    src/sys/arch/xen/include/xen-public/grant_table.h \
    src/sys/arch/xen/include/xen-public/physdev.h \
    src/sys/arch/xen/include/xen-public/sched_ctl.h \
    src/sys/arch/xen/include/xen-public/trace.h \
    src/sys/arch/xen/include/xen-public/xen.h
cvs rdiff -r0 -r1.2 src/sys/arch/xen/include/xen-public/io/blkif.h \
    src/sys/arch/xen/include/xen-public/io/domain_controller.h \
    src/sys/arch/xen/include/xen-public/io/netif.h
cvs rdiff -r1.1 -r0 src/sys/arch/xen/stand/Makefile
cvs rdiff -r1.3 -r0 src/sys/arch/xen/stand/xen12load/Makefile
cvs rdiff -r1.1 -r0 src/sys/arch/xen/stand/xen12load/loadelf.c \
    src/sys/arch/xen/stand/xen12load/start.S \
    src/sys/arch/xen/stand/xen12load/xenload.c
cvs rdiff -r1.2 -r0 src/sys/arch/xen/stand/xen12load/xenload.h
cvs rdiff -r0 -r1.2 src/sys/arch/xen/x86/bus_dma.c
cvs rdiff -r1.2 -r1.3 src/sys/arch/xen/x86/bus_space.c
cvs rdiff -r1.3 -r1.4 src/sys/arch/xen/x86/consinit.c \
    src/sys/arch/xen/x86/intr.c
cvs rdiff -r1.7 -r1.8 src/sys/arch/xen/xen/clock.c
cvs rdiff -r0 -r1.2 src/sys/arch/xen/xen/ctrl_if.c \
    src/sys/arch/xen/xen/evtchn.c src/sys/arch/xen/xen/isa_machdep.c \
    src/sys/arch/xen/xen/pci_machdep.c src/sys/arch/xen/xen/pcib.c \
    src/sys/arch/xen/xen/pciide_machdep.c src/sys/arch/xen/xen/xbdback.c \
    src/sys/arch/xen/xen/xenevt.c src/sys/arch/xen/xen/xennetback.c
cvs rdiff -r1.5 -r0 src/sys/arch/xen/xen/events.c
cvs rdiff -r1.8 -r1.9 src/sys/arch/xen/xen/hypervisor.c
cvs rdiff -r1.11 -r1.12 src/sys/arch/xen/xen/if_xennet.c
cvs rdiff -r1.1 -r0 src/sys/arch/xen/xen/machmem.c
cvs rdiff -r1.1 -r1.2 src/sys/arch/xen/xen/privcmd.c \
    src/sys/arch/xen/xen/xencons.c
cvs rdiff -r1.12 -r1.13 src/sys/arch/xen/xen/xbd.c
cvs rdiff -r1.2 -r1.3 src/sys/arch/xen/xen/xen_debug.c

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