bitkeeper revision 1.1159.142.4 (4184b6d4rc3Jd2irJimPyupm4TO06A)

Rename Xen public interfaces.
 1. hypervisor-if.h is now xen.h
 2. hypervisor-ifs/ directory is now:
     <include/public/...> in Xen
     <asm/xen-public/...> in Linux
     <xen/...> in user space
This commit is contained in:
kaf24@freefall.cl.cam.ac.uk committed 2004-10-31 09:56:36 +00:00
1 parent 7458077a2a
commit 908871cf62
84 files changed
+178 -181

No files matched your search

+13 -13
View File
@@ -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
+5 -6
View File
@@ -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)
+2 -2
View File
@@ -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.*/
+1 -1
View File
@@ -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}
+4 -4
View File
@@ -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
+1 -1
View File
@@ -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
+2 -3
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
@@ -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 )
@@ -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"
@@ -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>
@@ -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);
@@ -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>
@@ -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)
@@ -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
+5 -5
View File
@@ -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
+4 -4
View File
@@ -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
@@ -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)
@@ -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.
@@ -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)
{
@@ -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
@@ -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
@@ -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)
@@ -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>
@@ -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>
@@ -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) \
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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;
@@ -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)
@@ -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
@@ -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(
@@ -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>
+5 -5
View File
@@ -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
+5 -5
View File
@@ -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
@@ -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
@@ -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...
*/
@@ -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)
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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"
+1 -2
View File
@@ -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",
+2 -2
View File
@@ -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>
+2 -2
View File
@@ -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*
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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>
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 */
+1 -1
View File
@@ -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>
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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. */
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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;
+2 -2
View File
@@ -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);
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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*/
+2 -2
View File
@@ -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];
+1 -1
View File
@@ -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.
+2 -2
View File
@@ -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;
+1 -1
View File
@@ -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;
File renamed without changes.
@@ -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
@@ -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
@@ -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__ */
@@ -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__ */
@@ -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__ */
@@ -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__ */
@@ -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__ */
@@ -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. */
@@ -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__ */
@@ -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__ */
@@ -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__ */
@@ -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__ */
+2 -2
View File
@@ -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;
+2 -2
View File
@@ -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>
+1 -1
View File
@@ -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();
+3 -3
View File
@@ -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);
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.