diff options
| author | kaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk> | 2004-10-31 09:56:36 +0000 |
|---|---|---|
| committer | kaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk> | 2004-10-31 09:56:36 +0000 |
| commit | 908871cf6216a52fbf2fc610fcc0374edf619a13 (patch) | |
| tree | ae03c3c02dbcee87e67b9dfdd5227116c30a5212 /extras | |
| parent | 7458077a2a74609f78f595998625311266d61368 (diff) | |
| download | xen-908871cf6216a52fbf2fc610fcc0374edf619a13.tar.gz xen-908871cf6216a52fbf2fc610fcc0374edf619a13.tar.bz2 xen-908871cf6216a52fbf2fc610fcc0374edf619a13.zip | |
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
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/mini-os/Makefile | 8 | ||||
| -rw-r--r-- | extras/mini-os/h/events.h | 2 | ||||
| -rw-r--r-- | extras/mini-os/h/hypervisor.h | 5 | ||||
| -rw-r--r-- | extras/mini-os/h/os.h | 4 |
4 files changed, 9 insertions, 10 deletions
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 |