diff options
84 files changed, 178 insertions, 181 deletions
@@ -732,19 +732,19 @@ 404f1bb86rAXB3aLS1vYdcqpJiEcyg xen/include/asm-x86/x86_64/ptrace.h 40e1966azOJZfNI6Ilthe6Q-T3Hewg xen/include/asm-x86/x86_64/string.h 404f1bc4tWkB9Qr8RkKtZGW5eMQzhw xen/include/asm-x86/x86_64/uaccess.h -400304fcmRQmDdFYEzDh0wcBba9alg xen/include/hypervisor-ifs/COPYING -404f1bc68SXxmv0zQpXBWGrCzSyp8w xen/include/hypervisor-ifs/arch-x86_32.h -404f1bc7IwU-qnH8mJeVu0YsNGMrcw xen/include/hypervisor-ifs/arch-x86_64.h -3ddb79c2PMeWTK86y4C3F4MzHw4A1g xen/include/hypervisor-ifs/dom0_ops.h -403cd194j2pyLqXD8FJ-ukvZzkPenw xen/include/hypervisor-ifs/event_channel.h -4121d149udGfSUGhn3k1ECz0bM31nQ xen/include/hypervisor-ifs/grant_table.h -3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/hypervisor-ifs/hypervisor-if.h -40f5623bqoi4GEoBiiUc6TZk1HjsMg xen/include/hypervisor-ifs/io/blkif.h -40dc4076pVeE1kEEWzcUaNZin65kCA xen/include/hypervisor-ifs/io/domain_controller.h -40f5623cTZ80EwjWUBlh44A9F9i_Lg xen/include/hypervisor-ifs/io/netif.h -4051db79512nOCGweabrFWO2M2h5ng xen/include/hypervisor-ifs/physdev.h -40589968wmhPmV5-ENbBYmMjnedgKw xen/include/hypervisor-ifs/sched_ctl.h -404f3d2eR2Owk-ZcGOx9ULGHg3nrww xen/include/hypervisor-ifs/trace.h +400304fcmRQmDdFYEzDh0wcBba9alg xen/include/public/COPYING +404f1bc68SXxmv0zQpXBWGrCzSyp8w xen/include/public/arch-x86_32.h +404f1bc7IwU-qnH8mJeVu0YsNGMrcw xen/include/public/arch-x86_64.h +3ddb79c2PMeWTK86y4C3F4MzHw4A1g xen/include/public/dom0_ops.h +403cd194j2pyLqXD8FJ-ukvZzkPenw xen/include/public/event_channel.h +4121d149udGfSUGhn3k1ECz0bM31nQ xen/include/public/grant_table.h +40f5623bqoi4GEoBiiUc6TZk1HjsMg xen/include/public/io/blkif.h +40dc4076pVeE1kEEWzcUaNZin65kCA xen/include/public/io/domain_controller.h +40f5623cTZ80EwjWUBlh44A9F9i_Lg xen/include/public/io/netif.h +4051db79512nOCGweabrFWO2M2h5ng xen/include/public/physdev.h +40589968wmhPmV5-ENbBYmMjnedgKw xen/include/public/sched_ctl.h +404f3d2eR2Owk-ZcGOx9ULGHg3nrww xen/include/public/trace.h +3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/public/xen.h 3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xen/ac_timer.h 40715b2epYl2jBbxzz9CI2rgIca7Zg xen/include/xen/acpi.h 3ddb79c0c0cX_DZE209-Bb-Rx1v-Aw xen/include/xen/cache.h @@ -17,12 +17,11 @@ Xen guests, certain files in this repository are not subject to the GPL when distributed separately or included in software packages outside this repository. Instead we specify a much more relaxed BSD-style license. Affected files include the Xen interface headers -(xen/include/hypervisor-ifs/COPYING), and various drivers, support -functions and header files within the Linux sparse source trees. In -all such cases, license terms are stated at the top of the file or in -a COPYING file in the same directory. Note that _any_ file that is -modified and then distributed within a Linux kernel is still subject -to the GNU GPL! +(xen/include/public/COPYING), and various drivers, support functions +and header files within the Linux sparse source trees. In all such +cases, license terms are stated at the top of the file or in a COPYING +file in the same directory. Note that _any_ file that is modified and +then distributed within a Linux kernel is still subject to the GNU GPL. -- Keir Fraser (on behalf of the Xen team) diff --git a/docs/misc/blkif-drivers-explained.txt b/docs/misc/blkif-drivers-explained.txt index 8f6f7a498a..adf1d3738a 100644 --- a/docs/misc/blkif-drivers-explained.txt +++ b/docs/misc/blkif-drivers-explained.txt @@ -244,8 +244,8 @@ records. Pointers may only advance, and may not pass one another. By adopting the convention that every request will receive a response, not all four pointers need be shared and flow control on the ring becomes very easy to manage. Each domain manages its own -consumer pointer, and the two producer pointers are visible to both (Xen/include/hypervisor-ifs/io/blkif.h): - +consumer pointer, and the two producer pointers are visible to both +(xen/include/public/io/blkif.h): /* NB. Ring size must be small enough for sizeof(blkif_ring_t) <=PAGE_SIZE.*/ diff --git a/docs/src/interface.tex b/docs/src/interface.tex index d6ac3542b2..25a169eb66 100644 --- a/docs/src/interface.tex +++ b/docs/src/interface.tex @@ -514,7 +514,7 @@ this scheduler. \subsubsection{sched\_id} This is an integer that uniquely identifies this scheduler. There should be a -macro corrsponding to this scheduler ID in {\tt <hypervisor-ifs/sched-if.h>}. +macro corrsponding to this scheduler ID in {\tt <xen/sched-if.h>}. \subsubsection{init\_scheduler} diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index d2d478ac40..606454b6bb 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -14,16 +14,16 @@ TARGET := mini-os LOBJS := lib/malloc.o lib/math.o lib/printf.o lib/string.o OBJS := entry.o kernel.o traps.o hypervisor.o mm.o events.o time.o ${LOBJS} -HINTF := h/hypervisor-ifs/hypervisor-if.h +HINTF := h/xen-public/xen.h HDRS := h/os.h h/types.h h/hypervisor.h h/mm.h h/events.h h/time.h h/lib.h HDRS += $(HINTF) default: $(TARGET) -hypervisor-ifs: - ln -sf ../../../xen/include/hypervisor-ifs h/hypervisor-ifs +xen-public: + [ -e h/xen-public] || ln -sf ../../../xen/include/public h/xen-public -$(TARGET): hypervisor-ifs head.o $(OBJS) +$(TARGET): xen-public head.o $(OBJS) $(LD) -N -T minios.lds head.o $(OBJS) -o $@.elf objcopy -R .note -R .comment $@.elf $@ gzip -f -9 -c $@ >$@.gz diff --git a/extras/mini-os/h/events.h b/extras/mini-os/h/events.h index 5166876b76..c8f696ae90 100644 --- a/extras/mini-os/h/events.h +++ b/extras/mini-os/h/events.h @@ -20,7 +20,7 @@ #ifndef _EVENTS_H_ #define _EVENTS_H_ -/* _EVENT_* are defined in hypervisor-if.h */ +/* _EVENT_* are defined in xen-public/xen.h */ #define EV_BLKDEV _EVENT_BLKDEV #define EV_TIMER _EVENT_TIMER #define EV_DIE _EVENT_DIE diff --git a/extras/mini-os/h/hypervisor.h b/extras/mini-os/h/hypervisor.h index c29bd1723e..3a127e1290 100644 --- a/extras/mini-os/h/hypervisor.h +++ b/extras/mini-os/h/hypervisor.h @@ -11,9 +11,8 @@ #include <types.h> -/* include the hypervisor interface */ -#include <hypervisor-ifs/hypervisor-if.h> -#include "../../../tools/xu/lib/domain_controller.h" +#include <xen-public/xen.h> +#include <xen-public/io/domain_controller.h> /* * a placeholder for the start of day information passed up from the hypervisor diff --git a/extras/mini-os/h/os.h b/extras/mini-os/h/os.h index c717b66961..cf15d92126 100644 --- a/extras/mini-os/h/os.h +++ b/extras/mini-os/h/os.h @@ -29,7 +29,7 @@ /* - * these are also defined in hypervisor-if.h but can't be pulled in as + * these are also defined in xen-public/xen.h but can't be pulled in as * they are used in start of day assembly. Need to clean up the .h files * a bit more... */ @@ -48,7 +48,7 @@ #ifndef __ASSEMBLY__ #include <types.h> -#include <hypervisor-ifs/hypervisor-if.h> +#include <xen-public/xen.h> /* this struct defines the way the registers are stored on the diff --git a/linux-2.4.27-xen-sparse/arch/xen/Makefile b/linux-2.4.27-xen-sparse/arch/xen/Makefile index f8f1e96214..1db1b7f1b6 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/Makefile +++ b/linux-2.4.27-xen-sparse/arch/xen/Makefile @@ -127,7 +127,7 @@ archclean: @$(MAKEBOOT) clean archmrproper: - rm -f include/asm-xen/hypervisor-ifs/arch + rm -f include/asm-xen/xen-public/arch archdep: @$(MAKEBOOT) dep diff --git a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h index 03937e0e4c..d16895d2c2 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h +++ b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h @@ -18,11 +18,11 @@ #include <linux/hdreg.h> #include <linux/blkdev.h> #include <linux/major.h> -#include <asm/hypervisor-ifs/hypervisor-if.h> +#include <asm/xen-public/xen.h> #include <asm/io.h> #include <asm/atomic.h> #include <asm/uaccess.h> -#include <asm-xen/hypervisor-ifs/io/blkif.h> +#include <asm/xen-public/io/blkif.h> #if 0 #define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a ) diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c index 48dcecd6ec..b77703ac89 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c @@ -18,8 +18,8 @@ #include <asm/segment.h> #include <asm/io.h> -#include <asm/hypervisor-ifs/hypervisor-if.h> -#include <asm/hypervisor-ifs/physdev.h> +#include <asm/xen-public/xen.h> +#include <asm/xen-public/physdev.h> #include "pci-i386.h" diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c index 9c1123b740..806e9a73f6 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c @@ -44,7 +44,7 @@ #include <asm/desc.h> #include <asm/mmu_context.h> #include <asm/multicall.h> -#include <asm/hypervisor-ifs/dom0_ops.h> +#include <asm/xen-public/dom0_ops.h> #include <linux/irq.h> diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c index 61c2f73a07..92312734b8 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c @@ -48,7 +48,7 @@ static int errno; #include <asm/mmu_context.h> #include <asm/ctrl_if.h> #include <asm/hypervisor.h> -#include <asm/hypervisor-ifs/dom0_ops.h> +#include <asm/xen-public/dom0_ops.h> #include <linux/netdevice.h> #include <linux/rtnetlink.h> #include <linux/tqueue.h> @@ -335,7 +335,7 @@ void __init setup_arch(char **cmdline_p) * and the bootmem bitmap. * NB. There is definitely enough room for the bootmem bitmap in the * bootstrap page table. We are guaranteed to get >=512kB unused 'padding' - * for our own use after all bootstrap elements (see hypervisor-if.h). + * for our own use after all bootstrap elements (see asm/xen-public/xen.h). */ boot_pfn = min((int)xen_start_info.nr_pages,lmax_low_pfn); bootmap_size = init_bootmem(start_pfn,boot_pfn); diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c index 3a4f8bf2c5..d4b6f5edac 100644 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c @@ -52,7 +52,7 @@ #include <asm/div64.h> #include <asm/hypervisor.h> -#include <asm/hypervisor-ifs/dom0_ops.h> +#include <asm/xen-public/dom0_ops.h> #include <linux/mc146818rtc.h> #include <linux/kernel.h> diff --git a/linux-2.4.27-xen-sparse/include/asm-xen/page.h b/linux-2.4.27-xen-sparse/include/asm-xen/page.h index 26e504485b..239daa6ede 100644 --- a/linux-2.4.27-xen-sparse/include/asm-xen/page.h +++ b/linux-2.4.27-xen-sparse/include/asm-xen/page.h @@ -12,7 +12,7 @@ #include <linux/config.h> #include <linux/string.h> #include <asm/types.h> -#include <asm/hypervisor-ifs/hypervisor-if.h> +#include <asm/xen-public/xen.h> #ifdef CONFIG_XEN_SCRUB_PAGES #define scrub_pages(_p,_n) memset((void *)(_p), 0, (_n) << PAGE_SHIFT) diff --git a/linux-2.4.27-xen-sparse/include/asm-xen/segment.h b/linux-2.4.27-xen-sparse/include/asm-xen/segment.h index ca13028ce0..276765d1de 100644 --- a/linux-2.4.27-xen-sparse/include/asm-xen/segment.h +++ b/linux-2.4.27-xen-sparse/include/asm-xen/segment.h @@ -4,7 +4,7 @@ #ifndef __ASSEMBLY__ #include <linux/types.h> #endif -#include <asm/hypervisor-ifs/hypervisor-if.h> +#include <asm/xen-public/xen.h> #define __KERNEL_CS FLAT_RING1_CS #define __KERNEL_DS FLAT_RING1_DS diff --git a/linux-2.4.27-xen-sparse/mkbuildtree b/linux-2.4.27-xen-sparse/mkbuildtree index 3180d21675..ff5e789ccf 100755 --- a/linux-2.4.27-xen-sparse/mkbuildtree +++ b/linux-2.4.27-xen-sparse/mkbuildtree @@ -107,11 +107,11 @@ set ${RS}/../linux-2.6.*-xen-sparse LINUX_26="$1" -# Create links to the shared definitions of the hypervisor interface -rm -rf ${AD}/include/asm-xen/hypervisor-ifs -mkdir ${AD}/include/asm-xen/hypervisor-ifs -cd ${AD}/include/asm-xen/hypervisor-ifs -relative_lndir ../../../${RS}/../xen/include/hypervisor-ifs +# Create links to the shared definitions of the Xen interfaces. +rm -rf ${AD}/include/asm-xen/xen-public +mkdir ${AD}/include/asm-xen/xen-public +cd ${AD}/include/asm-xen/xen-public +relative_lndir ../../../${RS}/../xen/include/public # Create a link to the shared definitions for the control interface cd ${AD}/include/asm-xen diff --git a/linux-2.6.9-xen-sparse/arch/xen/Makefile b/linux-2.6.9-xen-sparse/arch/xen/Makefile index 224e0aa34f..bda9cb8665 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/Makefile +++ b/linux-2.6.9-xen-sparse/arch/xen/Makefile @@ -33,16 +33,16 @@ include/asm-xen/asm: @echo ' SYMLINK $@ -> include/asm-xen/asm-$(XENARCH)' @ln -fsn asm-$(XENARCH) $@ -include/asm-xen/asm-$(XENARCH)/hypervisor-ifs: - @echo ' SYMLINK $@ -> include/asm-xen/hypervisor-ifs' - @ln -fsn ../hypervisor-ifs $@ +include/asm-xen/asm-$(XENARCH)/xen-public: + @echo ' SYMLINK $@ -> include/asm-xen/xen-public' + @ln -fsn ../xen-public $@ arch/xen/arch: @rm -f $@ @ln -fsn $(XENARCH) $@ prepare: include/.asm-ignore include/asm-xen/asm \ - include/asm-xen/asm-$(XENARCH)/hypervisor-ifs \ + include/asm-xen/asm-$(XENARCH)/xen-public \ arch/xen/arch ; all: vmlinuz diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S index f1e60cc06c..e6978360e8 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S @@ -48,7 +48,7 @@ #include <asm/smp.h> #include <asm/page.h> #include "irq_vectors.h" -#include <asm/hypervisor-ifs/hypervisor-if.h> +#include <asm/xen-public/xen.h> #define nr_syscalls ((syscall_table_size)/4) diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S index b41a96db42..b773a18e5e 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S @@ -15,7 +15,7 @@ #include <asm/segment.h> #include <asm/thread_info.h> #include <asm/asm_offsets.h> -#include <asm/hypervisor-ifs/arch-x86_32.h> +#include <asm/xen-public/arch-x86_32.h> /* * References to members of the new_cpu_data structure. diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c index bb3b0f3090..3c85bee294 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c @@ -8,7 +8,7 @@ #include <linux/smp_lock.h> #include <linux/stddef.h> #include <linux/slab.h> -#include <asm/hypervisor-ifs/dom0_ops.h> +#include <asm/xen-public/dom0_ops.h> asmlinkage long sys_iopl(unsigned int new_io_pl) { diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c index 930e9151a3..66d9d6e4d0 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c @@ -47,7 +47,7 @@ #include <asm/irq.h> #include <asm/desc.h> #include <asm-xen/multicall.h> -#include <asm/hypervisor-ifs/dom0_ops.h> +#include <asm/xen-public/dom0_ops.h> #ifdef CONFIG_MATH_EMULATION #include <asm/math_emu.h> #endif diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c index 661221379b..e964ae00f1 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c @@ -6,8 +6,8 @@ #include <linux/init.h> #include "pci.h" -#include <asm/hypervisor-ifs/hypervisor-if.h> -#include <asm/hypervisor-ifs/physdev.h> +#include <asm/xen-public/xen.h> +#include <asm/xen-public/physdev.h> /* * Functions for accessing PCI configuration space with type xen accesses diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c index 7dc8dfb0ba..b7761350a9 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c @@ -19,8 +19,8 @@ #include "pci.h" -#include <asm/hypervisor-ifs/hypervisor-if.h> -#include <asm/hypervisor-ifs/physdev.h> +#include <asm/xen-public/xen.h> +#include <asm/xen-public/physdev.h> /* * Never use: 0, 1, 2 (timer, keyboard, and cascade) diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c index b779ac114c..37ba61846a 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c +++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c @@ -38,8 +38,8 @@ #include <asm/system.h> #include <asm/ptrace.h> #include <asm/synch_bitops.h> -#include <asm/hypervisor-ifs/event_channel.h> -#include <asm/hypervisor-ifs/physdev.h> +#include <asm/xen-public/event_channel.h> +#include <asm/xen-public/physdev.h> #include <asm-xen/ctrl_if.h> #include <asm-xen/hypervisor.h> diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c index 9b9761e841..2e81929624 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c @@ -12,7 +12,7 @@ static int errno; #include <asm/mmu_context.h> #include <asm-xen/ctrl_if.h> #include <asm-xen/hypervisor.h> -#include <asm-xen/hypervisor-ifs/dom0_ops.h> +#include <asm-xen/xen-public/dom0_ops.h> #include <asm-xen/suspend.h> #include <asm-xen/queues.h> diff --git a/linux-2.6.9-xen-sparse/drivers/xen/blkback/common.h b/linux-2.6.9-xen-sparse/drivers/xen/blkback/common.h index 0fa60cdceb..4a12ca8fe9 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/blkback/common.h +++ b/linux-2.6.9-xen-sparse/drivers/xen/blkback/common.h @@ -14,7 +14,7 @@ #include <asm/pgalloc.h> #include <asm-xen/ctrl_if.h> #include <asm-xen/hypervisor.h> -#include <asm-xen/hypervisor-ifs/io/blkif.h> +#include <asm-xen/xen-public/io/blkif.h> #if 0 #define ASSERT(_p) \ diff --git a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h index 76255e8637..8503cfedcc 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h +++ b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h @@ -44,8 +44,8 @@ #include <linux/blkdev.h> #include <linux/major.h> #include <linux/devfs_fs_kernel.h> -#include <asm/hypervisor-ifs/hypervisor-if.h> -#include <asm-xen/hypervisor-ifs/io/blkif.h> +#include <asm/xen-public/xen.h> +#include <asm-xen/xen-public/io/blkif.h> #include <asm/io.h> #include <asm/atomic.h> #include <asm/uaccess.h> diff --git a/linux-2.6.9-xen-sparse/drivers/xen/console/console.c b/linux-2.6.9-xen-sparse/drivers/xen/console/console.c index 8309c253d0..f2da97e1f4 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/console/console.c +++ b/linux-2.6.9-xen-sparse/drivers/xen/console/console.c @@ -47,7 +47,7 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/uaccess.h> -#include <asm/hypervisor-ifs/event_channel.h> +#include <asm/xen-public/event_channel.h> #include <asm-xen/hypervisor.h> #include <asm-xen/evtchn.h> #include <asm-xen/ctrl_if.h> diff --git a/linux-2.6.9-xen-sparse/drivers/xen/netback/common.h b/linux-2.6.9-xen-sparse/drivers/xen/netback/common.h index 6646f5339f..a8eeac8aac 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/netback/common.h +++ b/linux-2.6.9-xen-sparse/drivers/xen/netback/common.h @@ -15,7 +15,7 @@ #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <asm-xen/ctrl_if.h> -#include <asm-xen/hypervisor-ifs/io/netif.h> +#include <asm-xen/xen-public/io/netif.h> #include <asm/io.h> #include <asm/pgalloc.h> diff --git a/linux-2.6.9-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6.9-xen-sparse/drivers/xen/netfront/netfront.c index 831572b4b2..6f702fa8f8 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6.9-xen-sparse/drivers/xen/netfront/netfront.c @@ -44,7 +44,7 @@ #include <asm/io.h> #include <asm-xen/evtchn.h> #include <asm-xen/ctrl_if.h> -#include <asm-xen/hypervisor-ifs/io/netif.h> +#include <asm-xen/xen-public/io/netif.h> #include <asm/page.h> #include <net/arp.h> diff --git a/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c b/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c index 42c5b1309c..62994ba302 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c +++ b/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c @@ -26,7 +26,7 @@ #include <asm/uaccess.h> #include <asm/tlb.h> #include <asm-xen/proc_cmd.h> -#include <asm/hypervisor-ifs/dom0_ops.h> +#include <asm/xen-public/dom0_ops.h> #include <asm-xen/xen_proc.h> static struct proc_dir_entry *privcmd_intf; diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h b/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h index 34e8f7f9eb..e2604817b6 100644 --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h +++ b/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h @@ -15,7 +15,7 @@ #include <linux/config.h> #include <linux/string.h> #include <linux/types.h> -#include <asm/hypervisor-ifs/hypervisor-if.h> +#include <asm/xen-public/xen.h> #ifdef CONFIG_XEN_SCRUB_PAGES #define scrub_pages(_p,_n) memset((void *)(_p), 0, (_n) << PAGE_SHIFT) diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h index 2ad902ed6b..ace8984b08 100644 --- a/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h +++ b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h @@ -35,7 +35,7 @@ #include <asm-xen/hypervisor.h> #include <asm/ptrace.h> #include <asm/synch_bitops.h> -#include <asm/hypervisor-ifs/event_channel.h> +#include <asm/xen-public/event_channel.h> /* * LOW-LEVEL DEFINITIONS diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/gnttab.h b/linux-2.6.9-xen-sparse/include/asm-xen/gnttab.h index 6e52923b17..fa166ec6b1 100644 --- a/linux-2.6.9-xen-sparse/include/asm-xen/gnttab.h +++ b/linux-2.6.9-xen-sparse/include/asm-xen/gnttab.h @@ -14,7 +14,7 @@ #include <linux/config.h> #include <asm-xen/hypervisor.h> -#include <asm-xen/hypervisor-ifs/grant_table.h> +#include <asm-xen/xen-public/grant_table.h> int gnttab_grant_foreign_access( diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h index 3054b30779..f3536bf38d 100644 --- a/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h +++ b/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h @@ -33,9 +33,9 @@ #include <linux/types.h> #include <linux/kernel.h> #include <linux/version.h> -#include <asm/hypervisor-ifs/hypervisor-if.h> -#include <asm/hypervisor-ifs/dom0_ops.h> -#include <asm/hypervisor-ifs/io/domain_controller.h> +#include <asm/xen-public/xen.h> +#include <asm/xen-public/dom0_ops.h> +#include <asm/xen-public/io/domain_controller.h> #include <asm/ptrace.h> #include <asm/page.h> diff --git a/linux-2.6.9-xen-sparse/mkbuildtree b/linux-2.6.9-xen-sparse/mkbuildtree index 20513e6ead..d353015ff2 100755 --- a/linux-2.6.9-xen-sparse/mkbuildtree +++ b/linux-2.6.9-xen-sparse/mkbuildtree @@ -103,9 +103,9 @@ relative_lndir ${RS} rm -f mkbuildtree -# Create links to the shared definitions of the hypervisor interface -rm -rf ${AD}/include/asm-xen/hypervisor-ifs -mkdir ${AD}/include/asm-xen/hypervisor-ifs -cd ${AD}/include/asm-xen/hypervisor-ifs -relative_lndir ../../../${RS}/../xen/include/hypervisor-ifs +# Create links to the shared definitions of the Xen interfaces. +rm -rf ${AD}/include/asm-xen/xen-public +mkdir ${AD}/include/asm-xen/xen-public +cd ${AD}/include/asm-xen/xen-public +relative_lndir ../../../${RS}/../xen/include/public diff --git a/netbsd-2.0-xen-sparse/mkbuildtree b/netbsd-2.0-xen-sparse/mkbuildtree index 2db906080a..1877db8a5e 100755 --- a/netbsd-2.0-xen-sparse/mkbuildtree +++ b/netbsd-2.0-xen-sparse/mkbuildtree @@ -103,11 +103,11 @@ relative_lndir ${RS} rm -f mkbuildtree -# Create links to the shared definitions of the hypervisor interface -rm -rf ${AD}/sys/arch/xen/include/hypervisor-ifs -mkdir ${AD}/sys/arch/xen/include/hypervisor-ifs -cd ${AD}/sys/arch/xen/include/hypervisor-ifs -relative_lndir ../../../../../${RS}/../xen/include/hypervisor-ifs +# Create links to the shared definitions of the Xen interface +rm -rf ${AD}/sys/arch/xen/include/xen-public +mkdir ${AD}/sys/arch/xen/include/xen-public +cd ${AD}/sys/arch/xen/include/xen-public +relative_lndir ../../../../../${RS}/../xen/include/public # Remove files which don't exist anymore rm -rf ${AD}/sys/arch/xen/xen/events.c diff --git a/netbsd-2.0-xen-sparse/sys/arch/xen/include/hypervisor.h b/netbsd-2.0-xen-sparse/sys/arch/xen/include/hypervisor.h index 3d3f1d38c7..035495d4be 100644 --- a/netbsd-2.0-xen-sparse/sys/arch/xen/include/hypervisor.h +++ b/netbsd-2.0-xen-sparse/sys/arch/xen/include/hypervisor.h @@ -54,12 +54,12 @@ struct xen_npx_attach_args { /* include the hypervisor interface */ #include <sys/systm.h> -#include <machine/hypervisor-ifs/hypervisor-if.h> -#include <machine/hypervisor-ifs/dom0_ops.h> -#include <machine/hypervisor-ifs/event_channel.h> -#include <machine/hypervisor-ifs/io/domain_controller.h> -#include <machine/hypervisor-ifs/io/netif.h> -#include <machine/hypervisor-ifs/io/blkif.h> +#include <machine/xen-public/xen.h> +#include <machine/xen-public/dom0_ops.h> +#include <machine/xen-public/event_channel.h> +#include <machine/xen-public/io/domain_controller.h> +#include <machine/xen-public/io/netif.h> +#include <machine/xen-public/io/blkif.h> #undef u8 #undef u16 diff --git a/netbsd-2.0-xen-sparse/sys/arch/xen/include/xen.h b/netbsd-2.0-xen-sparse/sys/arch/xen/include/xen.h index 274dad8410..e590db5ae6 100644 --- a/netbsd-2.0-xen-sparse/sys/arch/xen/include/xen.h +++ b/netbsd-2.0-xen-sparse/sys/arch/xen/include/xen.h @@ -85,7 +85,7 @@ void vprintk(const char *, va_list); /* - * these are also defined in hypervisor-if.h but can't be pulled in as + * these are also defined in xen-public/xen.h but can't be pulled in as * they are used in start of day assembly. Need to clean up the .h files * a bit more... */ diff --git a/netbsd-2.0-xen-sparse/sys/arch/xen/xen/xenkbc.c b/netbsd-2.0-xen-sparse/sys/arch/xen/xen/xenkbc.c index e54615567b..ede2207965 100644 --- a/netbsd-2.0-xen-sparse/sys/arch/xen/xen/xenkbc.c +++ b/netbsd-2.0-xen-sparse/sys/arch/xen/xen/xenkbc.c @@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: xenkbc.c,v 1.3.2.1 2004/05/22 15:57:43 he Exp $"); #include <machine/xenkbcvar.h> #include <machine/xen.h> #include <machine/hypervisor.h> -#include <machine/hypervisor-ifs/kbd.h> +#include <machine/xen-public/kbd.h> #include <machine/evtchn.h> #define KBC_DELAY DELAY(1000) diff --git a/tools/Make.defs b/tools/Make.defs index 1b4d4fec7f..7f40cfef6a 100644 --- a/tools/Make.defs +++ b/tools/Make.defs @@ -1,5 +1,5 @@ # -*- mode: Makefile; -*- -XEN_HYPERVISOR_IFS = $(XEN_ROOT)/xen/include/hypervisor-ifs +XEN_HYPERVISOR_IFS = $(XEN_ROOT)/xen/include/public XEN_LINUX_INCLUDE = $(XEN_ROOT)/linux-xen-sparse/include XEN_XC = $(XEN_ROOT)/tools/python/xen/lowlevel/xc XEN_LIBXC = $(XEN_ROOT)/tools/libxc diff --git a/tools/libxc/xc.h b/tools/libxc/xc.h index 4f01a8d9b4..ab3ace4ff1 100644 --- a/tools/libxc/xc.h +++ b/tools/libxc/xc.h @@ -18,7 +18,7 @@ typedef signed short s16; typedef signed long s32; typedef signed long long s64; -#include "xen/hypervisor-if.h" +#include "xen/xen.h" #include "xen/dom0_ops.h" #include "xen/event_channel.h" #include "xen/sched_ctl.h" diff --git a/tools/python/setup.py b/tools/python/setup.py index 7adae6cc94..ec7efc0b63 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -7,8 +7,7 @@ XEN_ROOT = "../.." extra_compile_args = [ "-fno-strict-aliasing", "-Wall", "-Werror" ] -include_dirs = [ XEN_ROOT + "/xen/include/hypervisor-ifs", - XEN_ROOT + "/linux-xen-sparse/include", +include_dirs = [ XEN_ROOT + "/linux-xen-sparse/include", XEN_ROOT + "/tools/python/xen/lowlevel/xu", XEN_ROOT + "/tools/libxc", XEN_ROOT + "/tools/libxutil", diff --git a/tools/python/xen/lowlevel/xu/xu.c b/tools/python/xen/lowlevel/xu/xu.c index d08a17aa11..5143700538 100644 --- a/tools/python/xen/lowlevel/xu/xu.c +++ b/tools/python/xen/lowlevel/xu/xu.c @@ -23,8 +23,8 @@ #include <signal.h> #include <xc.h> -#include <hypervisor-if.h> -#include <io/domain_controller.h> +#include <xen/xen.h> +#include <xen/io/domain_controller.h> #include <asm-xen/proc_cmd.h> diff --git a/xen/COPYING b/xen/COPYING index 8da935f55e..fb8fcc90fc 100644 --- a/xen/COPYING +++ b/xen/COPYING @@ -10,9 +10,9 @@ virtual machine monitor) is copyrighted by me and others who actually wrote it. Further note that the guest-OS interfacing header files, which -includes all files within the subdirectory include/hypervisor-ifs, are +includes all files within the subdirectory include/public, are *not* covered by the GPL but by a much weaker license: - include/hypervisor-ifs/COPYING + include/public/COPYING Also note that the only valid version of the GPL as far as Xen is concerned is _this_ particular version of the license (i.e., *only* diff --git a/xen/Makefile b/xen/Makefile index ae43aa188c..e47e2ea8a6 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -23,9 +23,9 @@ install: $(TARGET) install -m0644 $(TARGET).gz $(prefix)/boot install -m0644 $(TARGET)-syms $(prefix)/boot mkdir -p $(prefix)/usr/include/xen/io - install -m0644 include/hypervisor-ifs/*.h $(prefix)/usr/include/xen - install -m0644 include/hypervisor-ifs/io/*.h $(prefix)/usr/include/xen/io - install -m0644 include/hypervisor-ifs/COPYING $(prefix)/usr/include/xen + install -m0644 include/public/*.h $(prefix)/usr/include/xen + install -m0644 include/public/io/*.h $(prefix)/usr/include/xen/io + install -m0644 include/public/COPYING $(prefix)/usr/include/xen dist: $(TARGET) $(MAKE) prefix=`pwd`/../install dist=yes install diff --git a/xen/Rules.mk b/xen/Rules.mk index 12fde1e8e4..ecb20cb35a 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -18,7 +18,7 @@ TARGET_SUBARCH ?= $(COMPILE_SUBARCH) TARGET := $(BASEDIR)/xen HDRS := $(wildcard $(BASEDIR)/include/xen/*.h) HDRS += $(wildcard $(BASEDIR)/include/scsi/*.h) -HDRS += $(wildcard $(BASEDIR)/include/hypervisor-ifs/*.h) +HDRS += $(wildcard $(BASEDIR)/include/public/*.h) HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h) HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h) # compile.h is always regenerated, but other files shouldn't be rebuilt diff --git a/xen/arch/x86/boot/x86_32.S b/xen/arch/x86/boot/x86_32.S index ce09feb6e8..305c279c5e 100644 --- a/xen/arch/x86/boot/x86_32.S +++ b/xen/arch/x86/boot/x86_32.S @@ -1,5 +1,5 @@ #include <xen/config.h> -#include <hypervisor-ifs/hypervisor-if.h> +#include <public/xen.h> #include <asm/page.h> #define SECONDARY_CPU_FLAG 0xA5A5A5A5 diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 73a23023e2..98289c7ab6 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -1,5 +1,5 @@ #include <xen/config.h> -#include <hypervisor-ifs/hypervisor-if.h> +#include <public/xen.h> #include <asm/page.h> #include <asm/msr.h> diff --git a/xen/arch/x86/dom0_ops.c b/xen/arch/x86/dom0_ops.c index ce677b1165..62b2739d18 100644 --- a/xen/arch/x86/dom0_ops.c +++ b/xen/arch/x86/dom0_ops.c @@ -10,7 +10,7 @@ #include <xen/types.h> #include <xen/lib.h> #include <xen/mm.h> -#include <hypervisor-ifs/dom0_ops.h> +#include <public/dom0_ops.h> #include <xen/sched.h> #include <xen/event.h> #include <asm/domain_page.h> @@ -19,7 +19,7 @@ #include <xen/trace.h> #include <xen/console.h> #include <asm/shadow.h> -#include <hypervisor-ifs/sched_ctl.h> +#include <public/sched_ctl.h> #define TRC_DOM0OP_ENTER_BASE 0x00020000 #define TRC_DOM0OP_LEAVE_BASE 0x00030000 diff --git a/xen/arch/x86/trampoline.S b/xen/arch/x86/trampoline.S index d625a47558..9c89ecf059 100644 --- a/xen/arch/x86/trampoline.S +++ b/xen/arch/x86/trampoline.S @@ -16,7 +16,7 @@ */ #include <xen/config.h> -#include <hypervisor-ifs/hypervisor-if.h> +#include <public/xen.h> #include <asm/page.h> #ifdef CONFIG_SMP diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index 460104244c..5dad5b0b26 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -59,7 +59,7 @@ #include <xen/config.h> #include <xen/errno.h> #include <xen/softirq.h> -#include <hypervisor-ifs/hypervisor-if.h> +#include <public/xen.h> EBX = 0x00 ECX = 0x04 diff --git a/xen/common/debug-linux.c b/xen/common/debug-linux.c index 557997be3f..03c4995eb1 100644 --- a/xen/common/debug-linux.c +++ b/xen/common/debug-linux.c @@ -13,7 +13,7 @@ #include <xen/config.h> #include <xen/types.h> #include <xen/lib.h> -#include <hypervisor-ifs/dom0_ops.h> +#include <public/dom0_ops.h> #include <asm/pdb.h> /* from linux/sched.h */ diff --git a/xen/common/debug.c b/xen/common/debug.c index b17748a864..fa99d6bd8f 100644 --- a/xen/common/debug.c +++ b/xen/common/debug.c @@ -7,7 +7,7 @@ #include <xen/config.h> #include <xen/types.h> #include <xen/lib.h> -#include <hypervisor-ifs/dom0_ops.h> +#include <public/dom0_ops.h> #include <xen/sched.h> #include <xen/event.h> #include <asm/page.h> diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c index f949c7d7af..aa979f1dc0 100644 --- a/xen/common/dom0_ops.c +++ b/xen/common/dom0_ops.c @@ -10,7 +10,7 @@ #include <xen/types.h> #include <xen/lib.h> #include <xen/mm.h> -#include <hypervisor-ifs/dom0_ops.h> +#include <public/dom0_ops.h> #include <xen/sched.h> #include <xen/event.h> #include <asm/domain_page.h> @@ -18,7 +18,7 @@ #include <xen/trace.h> #include <xen/console.h> #include <asm/shadow.h> -#include <hypervisor-ifs/sched_ctl.h> +#include <public/sched_ctl.h> #define TRC_DOM0OP_ENTER_BASE 0x00020000 #define TRC_DOM0OP_LEAVE_BASE 0x00030000 diff --git a/xen/common/domain.c b/xen/common/domain.c index cbbd29c0cb..dff88d1fc0 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -14,7 +14,7 @@ #include <xen/time.h> #include <xen/console.h> #include <asm/shadow.h> -#include <hypervisor-ifs/dom0_ops.h> +#include <public/dom0_ops.h> #include <asm/domain_page.h> /* Both these structures are protected by the tasklist_lock. */ diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index ca2eb46f12..40e218c731 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -23,8 +23,8 @@ #include <xen/event.h> #include <xen/irq.h> -#include <hypervisor-ifs/hypervisor-if.h> -#include <hypervisor-ifs/event_channel.h> +#include <public/xen.h> +#include <public/event_channel.h> #define INIT_EVENT_CHANNELS 16 #define MAX_EVENT_CHANNELS 1024 diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 79bb14324a..481b05de17 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -24,7 +24,7 @@ #include <asm/io.h> #include <asm/uaccess.h> #include <asm/domain_page.h> -#include <hypervisor-ifs/dom0_ops.h> +#include <public/dom0_ops.h> unsigned long xenheap_phys_end; diff --git a/xen/common/physdev.c b/xen/common/physdev.c index ff486ba29b..b1c16d00b3 100644 --- a/xen/common/physdev.c +++ b/xen/common/physdev.c @@ -26,8 +26,8 @@ #include <xen/irq.h> #include <xen/event.h> #include <asm/pci.h> -#include <hypervisor-ifs/hypervisor-if.h> -#include <hypervisor-ifs/physdev.h> +#include <public/xen.h> +#include <public/physdev.h> /* Called by PHYSDEV_PCI_INITIALISE_DEVICE to finalise IRQ routing. */ extern void pcibios_enable_irq(struct pci_dev *dev); diff --git a/xen/common/sched_atropos.c b/xen/common/sched_atropos.c index b83d853d5d..1565b86ac9 100644 --- a/xen/common/sched_atropos.c +++ b/xen/common/sched_atropos.c @@ -20,7 +20,7 @@ #include <xen/time.h> #include <xen/sched.h> #include <xen/sched-if.h> -#include <hypervisor-ifs/sched_ctl.h> +#include <public/sched_ctl.h> #include <xen/trace.h> #define ATROPOS_TASK_UNBLOCKED 16 diff --git a/xen/common/sched_rrobin.c b/xen/common/sched_rrobin.c index 1915b37632..fbf17ab84c 100644 --- a/xen/common/sched_rrobin.c +++ b/xen/common/sched_rrobin.c @@ -6,7 +6,7 @@ #include <xen/sched.h> #include <xen/sched-if.h> -#include <hypervisor-ifs/sched_ctl.h> +#include <public/sched_ctl.h> #include <xen/ac_timer.h> #include <xen/softirq.h> #include <xen/time.h> diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 7b7530616c..138234104d 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -26,7 +26,7 @@ #include <xen/sched-if.h> #include <xen/softirq.h> #include <xen/trace.h> -#include <hypervisor-ifs/sched_ctl.h> +#include <public/sched_ctl.h> /*#define WAKE_HISTO*/ /*#define BLOCKTIME_HISTO*/ diff --git a/xen/common/trace.c b/xen/common/trace.c index 1e4e634627..4b8d5b6f37 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -13,7 +13,7 @@ * it's possible to reconstruct a chronological record of trace events. * * See also include/xen/trace.h and the dom0 op in - * include/hypervisor-ifs/dom0_ops.h + * include/public/dom0_ops.h */ #include <xen/config.h> @@ -26,7 +26,7 @@ #include <xen/trace.h> #include <xen/errno.h> #include <asm/atomic.h> -#include <hypervisor-ifs/dom0_ops.h> +#include <public/dom0_ops.h> /* Pointers to the meta-data objects for all system trace buffers */ struct t_buf *t_bufs[NR_CPUS]; diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 5068294ded..31a669c08d 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -14,7 +14,7 @@ #include <asm/flushtlb.h> #include <asm/io.h> -#include <hypervisor-ifs/hypervisor-if.h> +#include <public/xen.h> /* * Per-page-frame information. diff --git a/xen/include/asm-x86/pdb.h b/xen/include/asm-x86/pdb.h index db98294b7d..d718505089 100644 --- a/xen/include/asm-x86/pdb.h +++ b/xen/include/asm-x86/pdb.h @@ -14,8 +14,8 @@ #include <asm/ptrace.h> #include <xen/list.h> -#include <hypervisor-ifs/dom0_ops.h> -#include <hypervisor-ifs/hypervisor-if.h> /* for domain id */ +#include <public/dom0_ops.h> +#include <public/xen.h> /* for domain id */ extern int pdb_initialized; extern int pdb_com_port; diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index f6951c0bc1..e87c0986a1 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -15,7 +15,7 @@ #include <asm/pdb.h> #include <xen/config.h> #include <xen/spinlock.h> -#include <hypervisor-ifs/hypervisor-if.h> +#include <public/xen.h> struct domain; diff --git a/xen/include/hypervisor-ifs/COPYING b/xen/include/public/COPYING index 3377710a5c..3377710a5c 100644 --- a/xen/include/hypervisor-ifs/COPYING +++ b/xen/include/public/COPYING diff --git a/xen/include/hypervisor-ifs/arch-x86_32.h b/xen/include/public/arch-x86_32.h index 91a111bd92..1287cdbe04 100644 --- a/xen/include/hypervisor-ifs/arch-x86_32.h +++ b/xen/include/public/arch-x86_32.h @@ -1,11 +1,11 @@ /****************************************************************************** - * arch-i386/hypervisor-if.h + * arch-x86_32.h * * Guest OS interface to x86 32-bit Xen. */ -#ifndef __HYPERVISOR_IF_I386_H__ -#define __HYPERVISOR_IF_I386_H__ +#ifndef __XEN_PUBLIC_ARCH_X86_32_H__ +#define __XEN_PUBLIC_ARCH_X86_32_H__ /* * Pointers and other address fields inside interface structures are padded to diff --git a/xen/include/hypervisor-ifs/arch-x86_64.h b/xen/include/public/arch-x86_64.h index 8eab08f669..856b5070a8 100644 --- a/xen/include/hypervisor-ifs/arch-x86_64.h +++ b/xen/include/public/arch-x86_64.h @@ -1,11 +1,11 @@ /****************************************************************************** - * arch-x86_64/hypervisor-if.h + * arch-x86_64.h * - * Guest OS interface to AMD x86-64 bit Xen. + * Guest OS interface to x86 64-bit Xen. */ -#ifndef __HYPERVISOR_IF_X86_64_H__ -#define __HYPERVISOR_IF_X86_64_H__ +#ifndef __XEN_PUBLIC_ARCH_X86_64_H__ +#define __XEN_PUBLIC_ARCH_X86_64_H__ /* Pointers are naturally 64 bits in this architecture; no padding needed. */ #define _MEMORY_PADDING(_X) @@ -131,4 +131,4 @@ typedef struct { #endif /* !__ASSEMBLY__ */ -#endif /* __HYPERVISOR_IF_H__ */ +#endif diff --git a/xen/include/hypervisor-ifs/dom0_ops.h b/xen/include/public/dom0_ops.h index 05eaa4ad20..e19141ca02 100644 --- a/xen/include/hypervisor-ifs/dom0_ops.h +++ b/xen/include/public/dom0_ops.h @@ -8,10 +8,10 @@ */ -#ifndef __DOM0_OPS_H__ -#define __DOM0_OPS_H__ +#ifndef __XEN_PUBLIC_DOM0_OPS_H__ +#define __XEN_PUBLIC_DOM0_OPS_H__ -#include "hypervisor-if.h" +#include "xen.h" #include "sched_ctl.h" /* @@ -369,4 +369,4 @@ typedef struct { } PACKED u; } PACKED dom0_op_t; /* 80 bytes */ -#endif /* __DOM0_OPS_H__ */ +#endif /* __XEN_PUBLIC_DOM0_OPS_H__ */ diff --git a/xen/include/hypervisor-ifs/event_channel.h b/xen/include/public/event_channel.h index 2da4f06d24..284326d9b6 100644 --- a/xen/include/hypervisor-ifs/event_channel.h +++ b/xen/include/public/event_channel.h @@ -6,8 +6,8 @@ * Copyright (c) 2003-2004, K A Fraser. */ -#ifndef __HYPERVISOR_IFS__EVENT_CHANNEL_H__ -#define __HYPERVISOR_IFS__EVENT_CHANNEL_H__ +#ifndef __XEN_PUBLIC_EVENT_CHANNEL_H__ +#define __XEN_PUBLIC_EVENT_CHANNEL_H__ /* * EVTCHNOP_alloc_unbound: Allocate a fresh local port and prepare @@ -158,4 +158,4 @@ typedef struct { } PACKED u; } PACKED evtchn_op_t; /* 32 bytes */ -#endif /* __HYPERVISOR_IFS__EVENT_CHANNEL_H__ */ +#endif /* __XEN_PUBLIC_EVENT_CHANNEL_H__ */ diff --git a/xen/include/hypervisor-ifs/grant_table.h b/xen/include/public/grant_table.h index cb48c1f3b9..389e082646 100644 --- a/xen/include/hypervisor-ifs/grant_table.h +++ b/xen/include/public/grant_table.h @@ -7,8 +7,8 @@ * Copyright (c) 2004, K A Fraser */ -#ifndef __HYPERVISOR_IFS_GRANT_TABLE_H__ -#define __HYPERVISOR_IFS_GRANT_TABLE_H__ +#ifndef __XEN_PUBLIC_GRANT_TABLE_H__ +#define __XEN_PUBLIC_GRANT_TABLE_H__ /*********************************** @@ -248,4 +248,4 @@ typedef struct { } -#endif /* __HYPERVISOR_IFS_GRANT_TABLE_H__ */ +#endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */ diff --git a/xen/include/hypervisor-ifs/io/blkif.h b/xen/include/public/io/blkif.h index 1024629ea7..8cd3696eb6 100644 --- a/xen/include/hypervisor-ifs/io/blkif.h +++ b/xen/include/public/io/blkif.h @@ -6,8 +6,8 @@ * Copyright (c) 2003-2004, Keir Fraser */ -#ifndef __SHARED_BLKIF_H__ -#define __SHARED_BLKIF_H__ +#ifndef __XEN_PUBLIC_IO_BLKIF_H__ +#define __XEN_PUBLIC_IO_BLKIF_H__ #define blkif_vdev_t u16 #define blkif_sector_t u64 @@ -112,4 +112,4 @@ typedef struct { u16 info; /* 10: Device type and flags (VDISK_*). */ } PACKED vdisk_t; /* 12 bytes */ -#endif /* __SHARED_BLKIF_H__ */ +#endif /* __XEN_PUBLIC_IO_BLKIF_H__ */ diff --git a/xen/include/hypervisor-ifs/io/domain_controller.h b/xen/include/public/io/domain_controller.h index ab04072fe8..5a4056cd4d 100644 --- a/xen/include/hypervisor-ifs/io/domain_controller.h +++ b/xen/include/public/io/domain_controller.h @@ -7,8 +7,8 @@ * Copyright (c) 2004, K A Fraser */ -#ifndef __DOMAIN_CONTROLLER_H__ -#define __DOMAIN_CONTROLLER_H__ +#ifndef __XEN_PUBLIC_IO_DOMAIN_CONTROLLER_H__ +#define __XEN_PUBLIC_IO_DOMAIN_CONTROLLER_H__ /* @@ -575,4 +575,4 @@ typedef struct { } PACKED mem_request_t; /* 8 bytes */ -#endif /* __DOMAIN_CONTROLLER_H__ */ +#endif /* __XEN_PUBLIC_IO_DOMAIN_CONTROLLER_H__ */ diff --git a/xen/include/hypervisor-ifs/io/netif.h b/xen/include/public/io/netif.h index abb87bafaa..839cc8dade 100644 --- a/xen/include/hypervisor-ifs/io/netif.h +++ b/xen/include/public/io/netif.h @@ -6,8 +6,8 @@ * Copyright (c) 2003-2004, Keir Fraser */ -#ifndef __SHARED_NETIF_H__ -#define __SHARED_NETIF_H__ +#ifndef __XEN_PUBLIC_IO_NETIF_H__ +#define __XEN_PUBLIC_IO_NETIF_H__ typedef struct { memory_t addr; /* 0: Machine address of packet. */ diff --git a/xen/include/hypervisor-ifs/physdev.h b/xen/include/public/physdev.h index 4e1aa135d3..ab1af9998a 100644 --- a/xen/include/hypervisor-ifs/physdev.h +++ b/xen/include/public/physdev.h @@ -6,8 +6,8 @@ * Description: Interface for domains to access physical devices on the PCI bus */ -#ifndef __HYPERVISOR_IFS_PHYSDEV_H__ -#define __HYPERVISOR_IFS_PHYSDEV_H__ +#ifndef __XEN_PUBLIC_PHYSDEV_H__ +#define __XEN_PUBLIC_PHYSDEV_H__ /* Commands to HYPERVISOR_physdev_op() */ #define PHYSDEVOP_PCI_CFGREG_READ 0 @@ -77,4 +77,4 @@ typedef struct _physdev_op_st } PACKED u; } PACKED physdev_op_t; /* 40 bytes */ -#endif /* __HYPERVISOR_IFS_PHYSDEV_H__ */ +#endif /* __XEN_PUBLIC_PHYSDEV_H__ */ diff --git a/xen/include/hypervisor-ifs/sched_ctl.h b/xen/include/public/sched_ctl.h index 0c298f76d6..bd6a717521 100644 --- a/xen/include/hypervisor-ifs/sched_ctl.h +++ b/xen/include/public/sched_ctl.h @@ -4,8 +4,8 @@ * Mark Williamson, (C) 2004 Intel Research Cambridge */ -#ifndef __SCHED_CTL_H__ -#define __SCHED_CTL_H__ +#ifndef __XEN_PUBLIC_SCHED_CTL_H__ +#define __XEN_PUBLIC_SCHED_CTL_H__ /* Scheduler types */ #define SCHED_BVT 0 @@ -67,4 +67,4 @@ struct sched_adjdom_cmd } PACKED u; } PACKED; /* 40 bytes */ -#endif /* __SCHED_CTL_H__ */ +#endif /* __XEN_PUBLIC_SCHED_CTL_H__ */ diff --git a/xen/include/hypervisor-ifs/trace.h b/xen/include/public/trace.h index 52d53842ca..5e7904d52a 100644 --- a/xen/include/hypervisor-ifs/trace.h +++ b/xen/include/public/trace.h @@ -1,9 +1,9 @@ /****************************************************************************** - * include/hypervisor-ifs/trace.h + * trace.h */ -#ifndef __HYPERVISOR_IFS_TRACE_H__ -#define __HYPERVISOR_IFS_TRACE_H__ +#ifndef __XEN_PUBLIC_TRACE_H__ +#define __XEN_PUBLIC_TRACE_H__ /* This structure represents a single trace buffer record. */ struct t_rec { @@ -28,4 +28,4 @@ struct t_buf { struct t_rec *vdata; /* virtual address pointer to data */ }; -#endif /* __HYPERVISOR_IFS_TRACE_H__ */ +#endif /* __XEN_PUBLIC_TRACE_H__ */ diff --git a/xen/include/hypervisor-ifs/hypervisor-if.h b/xen/include/public/xen.h index 1038d3c88d..f103509b04 100644 --- a/xen/include/hypervisor-ifs/hypervisor-if.h +++ b/xen/include/public/xen.h @@ -1,13 +1,13 @@ /****************************************************************************** - * hypervisor-if.h + * xen.h * * Guest OS interface to Xen. * * Copyright (c) 2004, K A Fraser */ -#ifndef __HYPERVISOR_IF_H__ -#define __HYPERVISOR_IF_H__ +#ifndef __XEN_PUBLIC_XEN_H__ +#define __XEN_PUBLIC_XEN_H__ /* GCC-specific way to pack structure definitions (no implicit padding). */ #define PACKED __attribute__ ((packed)) @@ -21,7 +21,7 @@ #endif /* - * HYPERVISOR "SYSTEM CALLS" + * XEN "SYSTEM CALLS" (a.k.a. HYPERCALLS). */ /* EAX = vector; EBX, ECX, EDX, ESI, EDI = args 1, 2, 3, 4, 5. */ @@ -62,7 +62,7 @@ /* * VIRTUAL INTERRUPTS * - * Virtual interrupts that a guest OS may receive from the hypervisor. + * Virtual interrupts that a guest OS may receive from Xen. */ #define VIRQ_MISDIRECT 0 /* Catch-all interrupt for unbound VIRQs. */ #define VIRQ_TIMER 1 /* Timebase update, and/or requested timeout. */ @@ -422,4 +422,4 @@ extern shared_info_t *HYPERVISOR_shared_info; #endif /* !__ASSEMBLY__ */ -#endif /* __HYPERVISOR_IF_H__ */ +#endif /* __XEN_PUBLIC_XEN_H__ */ diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index bbacae6e4c..eb9d8c15af 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -26,7 +26,7 @@ #include <xen/config.h> #include <xen/mm.h> -#include <hypervisor-ifs/grant_table.h> +#include <public/grant_table.h> /* Active grant entry - used for shadowing GTF_permit_access grants. */ typedef struct { @@ -68,7 +68,7 @@ typedef struct { /* Per-domain grant information. */ typedef struct { - /* Shared grant table (see include/hypervisor-ifs/grant_table.h). */ + /* Shared grant table (see include/public/grant_table.h). */ grant_entry_t *shared; /* Active grant table. */ active_grant_entry_t *active; diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 7c1e7bc909..6eba6ab425 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -10,8 +10,8 @@ #include <xen/smp.h> #include <asm/page.h> #include <asm/processor.h> -#include <hypervisor-ifs/hypervisor-if.h> -#include <hypervisor-ifs/dom0_ops.h> +#include <public/xen.h> +#include <public/dom0_ops.h> #include <xen/list.h> #include <xen/time.h> #include <xen/ac_timer.h> diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h index 79ddb92309..dd476f9298 100644 --- a/xen/include/xen/time.h +++ b/xen/include/xen/time.h @@ -28,7 +28,7 @@ #define __XEN_TIME_H__ #include <xen/types.h> -#include <hypervisor-ifs/hypervisor-if.h> +#include <public/xen.h> extern int init_xen_time(); diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h index 3064c47a0b..88c0b23d39 100644 --- a/xen/include/xen/trace.h +++ b/xen/include/xen/trace.h @@ -15,13 +15,13 @@ * Access to the trace buffers is via a dom0 hypervisor op and analysis of * trace buffer contents can then be performed using a userland tool. * - * See also common/trace.c and the dom0 op in include/hypervisor-ifs/dom0_ops.h + * See also common/trace.c and the dom0 op in include/public/dom0_ops.h */ #ifndef __XEN_TRACE_H__ #define __XEN_TRACE_H__ -#include <hypervisor-ifs/trace.h> +#include <public/trace.h> #ifdef TRACE_BUFFER @@ -32,7 +32,7 @@ #include <asm/atomic.h> #include <asm/current.h> #include <asm/msr.h> -#include <hypervisor-ifs/dom0_ops.h> +#include <public/dom0_ops.h> /* Used to initialise trace buffer functionality */ void init_trace_bufs(void); |