ia64/xen-unstable

changeset 2821:724449a888fe

bitkeeper revision 1.1159.1.332 (41874e954CLIDA2J3phVFD2RnzVTpA)

Clean up public XenLinux header files. Now accessible from userspace as
#include <xen/linux...>
Got rid of the linux-xen-sparse symlink as it's no longer needed.
author kaf24@freefall.cl.cam.ac.uk
date Tue Nov 02 09:08:37 2004 +0000 (2004-11-02)
parents 583b600e8b21
children 73fcd80b5d6c
files .rootkeys BitKeeper/etc/ignore Makefile linux-2.4.27-xen-sparse/mkbuildtree linux-2.6.9-xen-sparse/arch/xen/Makefile linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c linux-2.6.9-xen-sparse/include/asm-xen/linux-public/privcmd.h linux-2.6.9-xen-sparse/include/asm-xen/linux-public/suspend.h linux-2.6.9-xen-sparse/include/asm-xen/proc_cmd.h linux-2.6.9-xen-sparse/include/asm-xen/suspend.h tools/Make.defs tools/libxc/Makefile tools/libxc/xc.h tools/libxc/xc_linux_restore.c tools/libxc/xc_linux_save.c tools/libxc/xc_private.h tools/misc/Makefile tools/python/setup.py tools/python/xen/lowlevel/xu/xu.c tools/xentrace/Makefile tools/xfrd/Makefile
line diff
     1.1 --- a/.rootkeys	Tue Nov 02 02:19:19 2004 +0000
     1.2 +++ b/.rootkeys	Tue Nov 02 09:08:37 2004 +0000
     1.3 @@ -234,10 +234,10 @@ 40f5623bYNP7tHE2zX6YQxp9Zq2utQ linux-2.6
     1.4  40f5623b3Eqs8pAc5WpPX8_jTzV2qw linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
     1.5  412dfaeazclyNDM0cpnp60Yo4xulpQ linux-2.6.9-xen-sparse/include/asm-xen/gnttab.h
     1.6  40f5623aGPlsm0u1LTO-NVZ6AGzNRQ linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h
     1.7 +3f108af1ylCIm82H052FVTfXACBHrw linux-2.6.9-xen-sparse/include/asm-xen/linux-public/privcmd.h
     1.8 +3fa8e3f0kBLeE4To2vpdi3cpJbIkbQ linux-2.6.9-xen-sparse/include/asm-xen/linux-public/suspend.h
     1.9  40f5623cndVUFlkxpf7Lfx7xu8madQ linux-2.6.9-xen-sparse/include/asm-xen/multicall.h
    1.10 -3f108af1ylCIm82H052FVTfXACBHrw linux-2.6.9-xen-sparse/include/asm-xen/proc_cmd.h
    1.11  4122466356eIBnC9ot44WSVVIFyhQA linux-2.6.9-xen-sparse/include/asm-xen/queues.h
    1.12 -3fa8e3f0kBLeE4To2vpdi3cpJbIkbQ linux-2.6.9-xen-sparse/include/asm-xen/suspend.h
    1.13  3f689063BoW-HWV3auUJ-OqXfcGArw linux-2.6.9-xen-sparse/include/asm-xen/xen_proc.h
    1.14  4124d8c4aocX7A-jIbuGraWN84pxGQ linux-2.6.9-xen-sparse/include/linux/bio.h
    1.15  4124f66fp5QwbDHEfoUIa7pqO5Xhag linux-2.6.9-xen-sparse/include/linux/page-flags.h
     2.1 --- a/BitKeeper/etc/ignore	Tue Nov 02 02:19:19 2004 +0000
     2.2 +++ b/BitKeeper/etc/ignore	Tue Nov 02 09:08:37 2004 +0000
     2.3 @@ -10,7 +10,7 @@
     2.4  BitKeeper/*/*
     2.5  PENDING/*
     2.6  TAGS
     2.7 -Twisted-1.3.0
     2.8 +Twisted-1.3.0/*
     2.9  Twisted-1.3.0.tar.gz
    2.10  docs/*.aux
    2.11  docs/*.dvi
    2.12 @@ -20,49 +20,21 @@ docs/*.ps
    2.13  docs/*.toc
    2.14  docs/figs/xenserver.eps
    2.15  docs/html/*
    2.16 -docs/interface/WARNINGS
    2.17 -docs/interface/images.pl
    2.18 -docs/interface/images.tex
    2.19 -docs/interface/img1.png
    2.20 -docs/interface/index.html
    2.21 -docs/interface/interface.css
    2.22 -docs/interface/interface.html
    2.23 -docs/interface/labels.pl
    2.24 -docs/user/WARNINGS
    2.25 -docs/user/images.pl
    2.26 -docs/user/images.tex
    2.27 -docs/user/img1.png
    2.28 -docs/user/img2.png
    2.29 -docs/user/img3.png
    2.30 -docs/user/index.html
    2.31 -docs/user/internals.pl
    2.32 -docs/user/labels.pl
    2.33 -docs/user/user.css
    2.34 -docs/user/user.html
    2.35 -docs/xend/WARNINGS
    2.36 -docs/xend/images.pl
    2.37 -docs/xend/images.tex
    2.38 -docs/xend/img1.png
    2.39 -docs/xend/index.html
    2.40 -docs/xend/internals.pl
    2.41 -docs/xend/labels.pl
    2.42 -docs/xend/xend.css
    2.43 -docs/xend/xend.html
    2.44 +docs/ps/*
    2.45 +docs/pdf/*
    2.46  extras/mini-os/h/hypervisor-ifs
    2.47 -install
    2.48  install/*
    2.49  linux-*-xen0/*
    2.50  linux-*-xenU/*
    2.51 -linux-xen-sparse
    2.52 -netbsd-*-tools
    2.53 -netbsd-*-xen0
    2.54 -netbsd-*-xenU
    2.55 +netbsd-*-tools/*
    2.56 +netbsd-*-xen0/*
    2.57 +netbsd-*-xenU/*
    2.58  patches/*
    2.59  pristine-*
    2.60  tools/*/build/lib*/*.py
    2.61  tools/balloon/balloon
    2.62  tools/check/.*
    2.63 -tools/libxc/xen
    2.64 +tools/libxc/xen/*
    2.65  tools/misc/miniterm/miniterm
    2.66  tools/misc/xen_cpuperf
    2.67  tools/web-shutdown.tap
     3.1 --- a/Makefile	Tue Nov 02 02:19:19 2004 +0000
     3.2 +++ b/Makefile	Tue Nov 02 09:08:37 2004 +0000
     3.3 @@ -11,7 +11,7 @@ SOURCEFORGE_MIRROR := http://heanet.dl.s
     3.4  .PHONY: docs delete-symlinks clean
     3.5  
     3.6  # a not partcularly useful but safe default target
     3.7 -all: make-symlinks
     3.8 +all:
     3.9  	$(MAKE) prefix=$(INSTALL_DIR) dist=yes -C xen install
    3.10  	$(MAKE) prefix=$(INSTALL_DIR) dist=yes -C tools install
    3.11  
    3.12 @@ -192,7 +192,7 @@ netbsd:
    3.13  	$(MAKE) mk-netbsd-trees
    3.14  	$(MAKE) netbsd-xenU
    3.15  
    3.16 -clean: delete-symlinks
    3.17 +clean:
    3.18  	$(MAKE) -C xen clean
    3.19  	$(MAKE) -C tools clean
    3.20  	$(MAKE) -C docs clean
    3.21 @@ -201,13 +201,6 @@ clean: delete-symlinks
    3.22  mrproper: clean
    3.23  	rm -rf install/* patches $(LINUX_TREES) linux-$(LINUX_VER).tar.*
    3.24  
    3.25 -make-symlinks: delete-symlinks
    3.26 -	ln -sf linux-$(LINUX26_VER)-xen-sparse linux-xen-sparse
    3.27 -
    3.28 -delete-symlinks:
    3.29 -	$(RM) linux-xen-sparse
    3.30 -
    3.31 -# handy target to install twisted (use rpm or apt-get in preference)
    3.32  install-twisted:
    3.33  	wget http://www.twistedmatrix.com/products/get-current.epy
    3.34  	tar -zxf Twisted-*.tar.gz
     4.1 --- a/linux-2.4.27-xen-sparse/mkbuildtree	Tue Nov 02 02:19:19 2004 +0000
     4.2 +++ b/linux-2.4.27-xen-sparse/mkbuildtree	Tue Nov 02 09:08:37 2004 +0000
     4.3 @@ -209,10 +209,12 @@ ln -sf ../../${LINUX_26}/include/asm-xen
     4.4  ln -sf ../../${LINUX_26}/include/asm-xen/gnttab.h
     4.5  ln -sf ../../${LINUX_26}/include/asm-xen/hypervisor.h
     4.6  ln -sf ../../${LINUX_26}/include/asm-xen/multicall.h
     4.7 -ln -sf ../../${LINUX_26}/include/asm-xen/proc_cmd.h
     4.8 -ln -sf ../../${LINUX_26}/include/asm-xen/suspend.h
     4.9  ln -sf ../../${LINUX_26}/include/asm-xen/xen_proc.h
    4.10  
    4.11 +mkdir -p linux-public && cd linux-public
    4.12 +ln -sf ../../../${LINUX_26}/include/asm-xen/linux-public/privcmd.h
    4.13 +ln -sf ../../../${LINUX_26}/include/asm-xen/linux-public/suspend.h
    4.14 +
    4.15  cd ${AD}/arch/xen/kernel
    4.16  ln -sf ../../i386/kernel/i387.c
    4.17  ln -sf ../../i386/kernel/init_task.c
     5.1 --- a/linux-2.6.9-xen-sparse/arch/xen/Makefile	Tue Nov 02 02:19:19 2004 +0000
     5.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/Makefile	Tue Nov 02 09:08:37 2004 +0000
     5.3 @@ -52,7 +52,8 @@ install: vmlinuz
     5.4  	install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
     5.5  	install -m0664 .config $(INSTALL_PATH)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
     5.6  	install -m0664 System.map $(INSTALL_PATH)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
     5.7 -
     5.8 +	mkdir -p $(INSTALL_PATH)/usr/include/xen/linux
     5.9 +	install -m0644 include/asm-xen/linux-public/*.h $(INSTALL_PATH)/usr/include/xen/linux
    5.10  dist:
    5.11  	$(MAKE) INSTALL_PATH=../install install
    5.12  
     6.1 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c	Tue Nov 02 02:19:19 2004 +0000
     6.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c	Tue Nov 02 09:08:37 2004 +0000
     6.3 @@ -13,7 +13,7 @@ static int errno;
     6.4  #include <asm-xen/ctrl_if.h>
     6.5  #include <asm-xen/hypervisor.h>
     6.6  #include <asm-xen/xen-public/dom0_ops.h>
     6.7 -#include <asm-xen/suspend.h>
     6.8 +#include <asm-xen/linux-public/suspend.h>
     6.9  #include <asm-xen/queues.h>
    6.10  
    6.11  void machine_restart(char * __unused)
     7.1 --- a/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c	Tue Nov 02 02:19:19 2004 +0000
     7.2 +++ b/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c	Tue Nov 02 09:08:37 2004 +0000
     7.3 @@ -1,5 +1,5 @@
     7.4  /******************************************************************************
     7.5 - * core.c
     7.6 + * privcmd.c
     7.7   * 
     7.8   * Interface to privileged domain-0 commands.
     7.9   * 
    7.10 @@ -25,7 +25,7 @@
    7.11  #include <asm/pgtable.h>
    7.12  #include <asm/uaccess.h>
    7.13  #include <asm/tlb.h>
    7.14 -#include <asm-xen/proc_cmd.h>
    7.15 +#include <asm-xen/linux-public/privcmd.h>
    7.16  #include <asm-xen/xen-public/dom0_ops.h>
    7.17  #include <asm-xen/xen_proc.h>
    7.18  
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/linux-2.6.9-xen-sparse/include/asm-xen/linux-public/privcmd.h	Tue Nov 02 09:08:37 2004 +0000
     8.3 @@ -0,0 +1,88 @@
     8.4 +/******************************************************************************
     8.5 + * privcmd.h
     8.6 + * 
     8.7 + * Interface to /proc/xen/privcmd.
     8.8 + * 
     8.9 + * Copyright (c) 2003-2004, K A Fraser
    8.10 + * 
    8.11 + * This file may be distributed separately from the Linux kernel, or
    8.12 + * incorporated into other software packages, subject to the following license:
    8.13 + * 
    8.14 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    8.15 + * of this source file (the "Software"), to deal in the Software without
    8.16 + * restriction, including without limitation the rights to use, copy, modify,
    8.17 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    8.18 + * and to permit persons to whom the Software is furnished to do so, subject to
    8.19 + * the following conditions:
    8.20 + * 
    8.21 + * The above copyright notice and this permission notice shall be included in
    8.22 + * all copies or substantial portions of the Software.
    8.23 + * 
    8.24 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    8.25 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    8.26 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    8.27 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    8.28 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    8.29 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    8.30 + * IN THE SOFTWARE.
    8.31 + */
    8.32 +
    8.33 +#ifndef __PRIVCMD_H__
    8.34 +#define __PRIVCMD_H__
    8.35 +
    8.36 +typedef struct privcmd_hypercall
    8.37 +{
    8.38 +    unsigned long op;
    8.39 +    unsigned long arg[5];
    8.40 +} privcmd_hypercall_t;
    8.41 +
    8.42 +typedef struct privcmd_mmap_entry {
    8.43 +    unsigned long va;
    8.44 +    unsigned long mfn;
    8.45 +    unsigned long npages;
    8.46 +} privcmd_mmap_entry_t; 
    8.47 +
    8.48 +typedef struct privcmd_mmap {
    8.49 +    int num;
    8.50 +    domid_t dom; /* target domain */
    8.51 +    privcmd_mmap_entry_t *entry;
    8.52 +} privcmd_mmap_t; 
    8.53 +
    8.54 +typedef struct privcmd_mmapbatch {
    8.55 +    int num;     /* number of pages to populate */
    8.56 +    domid_t dom; /* target domain */
    8.57 +    unsigned long addr;  /* virtual address */
    8.58 +    unsigned long *arr; /* array of mfns - top nibble set on err */
    8.59 +} privcmd_mmapbatch_t; 
    8.60 +
    8.61 +typedef struct privcmd_blkmsg
    8.62 +{
    8.63 +    unsigned long op;
    8.64 +    void         *buf;
    8.65 +    int           buf_size;
    8.66 +} privcmd_blkmsg_t;
    8.67 +
    8.68 +/*
    8.69 + * @cmd: IOCTL_PRIVCMD_HYPERCALL
    8.70 + * @arg: &privcmd_hypercall_t
    8.71 + * Return: Value returned from execution of the specified hypercall.
    8.72 + */
    8.73 +#define IOCTL_PRIVCMD_HYPERCALL         \
    8.74 +    _IOC(_IOC_NONE, 'P', 0, sizeof(privcmd_hypercall_t))
    8.75 +
    8.76 +/*
    8.77 + * @cmd: IOCTL_PRIVCMD_INITDOMAIN_EVTCHN
    8.78 + * @arg: n/a
    8.79 + * Return: Port associated with domain-controller end of control event channel
    8.80 + *         for the initial domain.
    8.81 + */
    8.82 +#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN \
    8.83 +    _IOC(_IOC_NONE, 'P', 1, 0)
    8.84 +#define IOCTL_PRIVCMD_MMAP             \
    8.85 +    _IOC(_IOC_NONE, 'P', 2, sizeof(privcmd_mmap_t))
    8.86 +#define IOCTL_PRIVCMD_MMAPBATCH             \
    8.87 +    _IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t))
    8.88 +#define IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN \
    8.89 +    _IOC(_IOC_READ, 'P', 4, sizeof(unsigned long))
    8.90 +
    8.91 +#endif /* __PRIVCMD_H__ */
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/linux-2.6.9-xen-sparse/include/asm-xen/linux-public/suspend.h	Tue Nov 02 09:08:37 2004 +0000
     9.3 @@ -0,0 +1,43 @@
     9.4 +/******************************************************************************
     9.5 + * suspend.h
     9.6 + * 
     9.7 + * Copyright (c) 2003-2004, K A Fraser
     9.8 + * 
     9.9 + * This file may be distributed separately from the Linux kernel, or
    9.10 + * incorporated into other software packages, subject to the following license:
    9.11 + * 
    9.12 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    9.13 + * of this source file (the "Software"), to deal in the Software without
    9.14 + * restriction, including without limitation the rights to use, copy, modify,
    9.15 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    9.16 + * and to permit persons to whom the Software is furnished to do so, subject to
    9.17 + * the following conditions:
    9.18 + * 
    9.19 + * The above copyright notice and this permission notice shall be included in
    9.20 + * all copies or substantial portions of the Software.
    9.21 + * 
    9.22 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    9.23 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    9.24 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    9.25 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    9.26 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    9.27 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    9.28 + * IN THE SOFTWARE.
    9.29 + */
    9.30 +
    9.31 +#ifndef __ASM_XEN_SUSPEND_H__
    9.32 +#define __ASM_XEN_SUSPEND_H__
    9.33 +
    9.34 +typedef struct suspend_record_st {
    9.35 +    /* To be filled in before resume. */
    9.36 +    start_info_t resume_info;
    9.37 +    /*
    9.38 +     * The number of a machine frame containing, in sequence, the number of
    9.39 +     * each machine frame that contains PFN -> MFN translation table data.
    9.40 +     */
    9.41 +    unsigned long pfn_to_mfn_frame_list;
    9.42 +    /* Number of entries in the PFN -> MFN translation table. */
    9.43 +    unsigned long nr_pfns;
    9.44 +} suspend_record_t;
    9.45 +
    9.46 +#endif /* __ASM_XEN_SUSPEND_H__ */
    10.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/proc_cmd.h	Tue Nov 02 02:19:19 2004 +0000
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,65 +0,0 @@
    10.4 -/******************************************************************************
    10.5 - * proc_cmd.h
    10.6 - * 
    10.7 - * Interface to /proc/cmd and /proc/xen/privcmd.
    10.8 - */
    10.9 -
   10.10 -#ifndef __PROC_CMD_H__
   10.11 -#define __PROC_CMD_H__
   10.12 -
   10.13 -typedef struct privcmd_hypercall
   10.14 -{
   10.15 -    unsigned long op;
   10.16 -    unsigned long arg[5];
   10.17 -} privcmd_hypercall_t;
   10.18 -
   10.19 -typedef struct privcmd_mmap_entry {
   10.20 -    unsigned long va;
   10.21 -    unsigned long mfn;
   10.22 -    unsigned long npages;
   10.23 -} privcmd_mmap_entry_t; 
   10.24 -
   10.25 -typedef struct privcmd_mmap {
   10.26 -    int num;
   10.27 -    domid_t dom; /* target domain */
   10.28 -    privcmd_mmap_entry_t *entry;
   10.29 -} privcmd_mmap_t; 
   10.30 -
   10.31 -typedef struct privcmd_mmapbatch {
   10.32 -    int num;     // number of pages to populate
   10.33 -    domid_t dom; // target domain 
   10.34 -    unsigned long addr;  // virtual address
   10.35 -    unsigned long *arr; // array of mfns - top nibble set on err
   10.36 -} privcmd_mmapbatch_t; 
   10.37 -
   10.38 -typedef struct privcmd_blkmsg
   10.39 -{
   10.40 -    unsigned long op;
   10.41 -    void         *buf;
   10.42 -    int           buf_size;
   10.43 -} privcmd_blkmsg_t;
   10.44 -
   10.45 -/*
   10.46 - * @cmd: IOCTL_PRIVCMD_HYPERCALL
   10.47 - * @arg: &privcmd_hypercall_t
   10.48 - * Return: Value returned from execution of the specified hypercall.
   10.49 - */
   10.50 -#define IOCTL_PRIVCMD_HYPERCALL         \
   10.51 -    _IOC(_IOC_NONE, 'P', 0, sizeof(privcmd_hypercall_t))
   10.52 -
   10.53 -/*
   10.54 - * @cmd: IOCTL_PRIVCMD_INITDOMAIN_EVTCHN
   10.55 - * @arg: n/a
   10.56 - * Return: Port associated with domain-controller end of control event channel
   10.57 - *         for the initial domain.
   10.58 - */
   10.59 -#define IOCTL_PRIVCMD_INITDOMAIN_EVTCHN \
   10.60 -    _IOC(_IOC_NONE, 'P', 1, 0)
   10.61 -#define IOCTL_PRIVCMD_MMAP             \
   10.62 -    _IOC(_IOC_NONE, 'P', 2, sizeof(privcmd_mmap_t))
   10.63 -#define IOCTL_PRIVCMD_MMAPBATCH             \
   10.64 -    _IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t))
   10.65 -#define IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN \
   10.66 -    _IOC(_IOC_READ, 'P', 4, sizeof(unsigned long))
   10.67 -
   10.68 -#endif /* __PROC_CMD_H__ */
    11.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/suspend.h	Tue Nov 02 02:19:19 2004 +0000
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,43 +0,0 @@
    11.4 -/******************************************************************************
    11.5 - * suspend.h
    11.6 - * 
    11.7 - * Copyright (c) 2003-2004, K A Fraser
    11.8 - * 
    11.9 - * This file may be distributed separately from the Linux kernel, or
   11.10 - * incorporated into other software packages, subject to the following license:
   11.11 - * 
   11.12 - * Permission is hereby granted, free of charge, to any person obtaining a copy
   11.13 - * of this source file (the "Software"), to deal in the Software without
   11.14 - * restriction, including without limitation the rights to use, copy, modify,
   11.15 - * merge, publish, distribute, sublicense, and/or sell copies of the Software,
   11.16 - * and to permit persons to whom the Software is furnished to do so, subject to
   11.17 - * the following conditions:
   11.18 - * 
   11.19 - * The above copyright notice and this permission notice shall be included in
   11.20 - * all copies or substantial portions of the Software.
   11.21 - * 
   11.22 - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   11.23 - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   11.24 - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
   11.25 - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   11.26 - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   11.27 - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
   11.28 - * IN THE SOFTWARE.
   11.29 - */
   11.30 -
   11.31 -#ifndef __ASM_XEN_SUSPEND_H__
   11.32 -#define __ASM_XEN_SUSPEND_H__
   11.33 -
   11.34 -typedef struct suspend_record_st {
   11.35 -    /* To be filled in before resume. */
   11.36 -    start_info_t resume_info;
   11.37 -    /*
   11.38 -     * The number of a machine frame containing, in sequence, the number of
   11.39 -     * each machine frame that contains PFN -> MFN translation table data.
   11.40 -     */
   11.41 -    unsigned long pfn_to_mfn_frame_list;
   11.42 -    /* Number of entries in the PFN -> MFN translation table. */
   11.43 -    unsigned long nr_pfns;
   11.44 -} suspend_record_t;
   11.45 -
   11.46 -#endif /* __ASM_XEN_SUSPEND_H__ */
    12.1 --- a/tools/Make.defs	Tue Nov 02 02:19:19 2004 +0000
    12.2 +++ b/tools/Make.defs	Tue Nov 02 09:08:37 2004 +0000
    12.3 @@ -1,6 +1,4 @@
    12.4  #  -*- mode: Makefile; -*-
    12.5 -XEN_HYPERVISOR_IFS = $(XEN_ROOT)/xen/include/public
    12.6 -XEN_LINUX_INCLUDE  = $(XEN_ROOT)/linux-xen-sparse/include
    12.7  XEN_XC             = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
    12.8  XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
    12.9  XEN_LIBXUTIL       = $(XEN_ROOT)/tools/libxutil
    13.1 --- a/tools/libxc/Makefile	Tue Nov 02 02:19:19 2004 +0000
    13.2 +++ b/tools/libxc/Makefile	Tue Nov 02 09:08:37 2004 +0000
    13.3 @@ -8,9 +8,6 @@ CC       = gcc
    13.4  XEN_ROOT = ../..
    13.5  include $(XEN_ROOT)/tools/Make.defs
    13.6  
    13.7 -vpath %h       $(XEN_LINUX_INCLUDE)
    13.8 -INCLUDES += -I $(XEN_LINUX_INCLUDE)
    13.9 -
   13.10  vpath %c       $(XEN_LIBXUTIL)
   13.11  INCLUDES += -I $(XEN_LIBXUTIL)
   13.12  
   13.13 @@ -32,7 +29,7 @@ CFLAGS   += -Wall
   13.14  CFLAGS   += -Werror
   13.15  CFLAGS   += -O3
   13.16  CFLAGS   += -fno-strict-aliasing
   13.17 -CFLAGS   += $(INCLUDES)
   13.18 +CFLAGS   += $(INCLUDES) -I.
   13.19  # Get gcc to generate the dependencies for us.
   13.20  CFLAGS   += -Wp,-MD,.$(@F).d
   13.21  DEPS     = .*.d
   13.22 @@ -51,8 +48,11 @@ check-for-zlib:
   13.23  	false; \
   13.24  	fi
   13.25  
   13.26 +LINUX_ROOT := $(wildcard $(XEN_ROOT)/linux-2.6.*-xen-sparse)
   13.27  mk-symlinks:
   13.28 -	[ -e xen ] || ln -sf $(XEN_HYPERVISOR_IFS) xen
   13.29 +	[ -e xen/linux ] || mkdir -p xen/linux
   13.30 +	lndir -silent ../$(XEN_ROOT)/xen/include/public xen
   13.31 +	lndir -silent ../../$(LINUX_ROOT)/include/asm-xen/linux-public xen/linux
   13.32  
   13.33  install: all
   13.34  	mkdir -p $(prefix)/usr/lib
   13.35 @@ -63,7 +63,7 @@ install: all
   13.36  	install -m0644 xc.h $(prefix)/usr/include
   13.37  
   13.38  clean:
   13.39 -	$(RM) *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen
   13.40 +	rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen
   13.41  
   13.42  rpm: all
   13.43  	rm -rf staging
    14.1 --- a/tools/libxc/xc.h	Tue Nov 02 02:19:19 2004 +0000
    14.2 +++ b/tools/libxc/xc.h	Tue Nov 02 09:08:37 2004 +0000
    14.3 @@ -18,11 +18,11 @@ typedef signed short       s16;
    14.4  typedef signed long        s32;
    14.5  typedef signed long long   s64;
    14.6  
    14.7 -#include "xen/xen.h"
    14.8 -#include "xen/dom0_ops.h"
    14.9 -#include "xen/event_channel.h"
   14.10 -#include "xen/sched_ctl.h"
   14.11 -#include "xen/io/domain_controller.h"
   14.12 +#include <xen/xen.h>
   14.13 +#include <xen/dom0_ops.h>
   14.14 +#include <xen/event_channel.h>
   14.15 +#include <xen/sched_ctl.h>
   14.16 +#include <xen/io/domain_controller.h>
   14.17  
   14.18  /* Obtain or relinquish a handle on the 'xc' library. */
   14.19  int xc_interface_open(void);
    15.1 --- a/tools/libxc/xc_linux_restore.c	Tue Nov 02 02:19:19 2004 +0000
    15.2 +++ b/tools/libxc/xc_linux_restore.c	Tue Nov 02 09:08:37 2004 +0000
    15.3 @@ -7,7 +7,7 @@
    15.4   */
    15.5  
    15.6  #include "xc_private.h"
    15.7 -#include <asm-xen/suspend.h>
    15.8 +#include <xen/linux/suspend.h>
    15.9  
   15.10  #define MAX_BATCH_SIZE 1024
   15.11  
    16.1 --- a/tools/libxc/xc_linux_save.c	Tue Nov 02 02:19:19 2004 +0000
    16.2 +++ b/tools/libxc/xc_linux_save.c	Tue Nov 02 09:08:37 2004 +0000
    16.3 @@ -8,7 +8,7 @@
    16.4  
    16.5  #include <sys/time.h>
    16.6  #include "xc_private.h"
    16.7 -#include <asm-xen/suspend.h>
    16.8 +#include <xen/linux/suspend.h>
    16.9  #include <time.h>
   16.10  
   16.11  #define BATCH_SIZE 1024   /* 1024 pages (4MB) at a time */
    17.1 --- a/tools/libxc/xc_private.h	Tue Nov 02 02:19:19 2004 +0000
    17.2 +++ b/tools/libxc/xc_private.h	Tue Nov 02 09:08:37 2004 +0000
    17.3 @@ -16,8 +16,7 @@
    17.4  
    17.5  #include "xc.h"
    17.6  
    17.7 -#include <asm-xen/proc_cmd.h>
    17.8 -
    17.9 +#include <xen/linux/privcmd.h>
   17.10  
   17.11  #define _PAGE_PRESENT   0x001
   17.12  #define _PAGE_RW        0x002
    18.1 --- a/tools/misc/Makefile	Tue Nov 02 02:19:19 2004 +0000
    18.2 +++ b/tools/misc/Makefile	Tue Nov 02 09:08:37 2004 +0000
    18.3 @@ -5,7 +5,6 @@ include $(XEN_ROOT)/tools/Make.defs
    18.4  CC         = gcc
    18.5  CFLAGS     = -Wall -O3 
    18.6  
    18.7 -INCLUDES += -I $(XEN_LINUX_INCLUDE)
    18.8  INCLUDES += -I $(XEN_XC)
    18.9  INCLUDES += -I $(XEN_LIBXC)
   18.10  INCLUDES += -I $(XEN_LIBXUTIL)
    19.1 --- a/tools/python/setup.py	Tue Nov 02 02:19:19 2004 +0000
    19.2 +++ b/tools/python/setup.py	Tue Nov 02 09:08:37 2004 +0000
    19.3 @@ -7,8 +7,7 @@ XEN_ROOT = "../.."
    19.4  extra_compile_args  = [ "-fno-strict-aliasing", "-Wall", "-Werror" ]
    19.5  
    19.6  
    19.7 -include_dirs = [ XEN_ROOT + "/linux-xen-sparse/include",
    19.8 -                 XEN_ROOT + "/tools/python/xen/lowlevel/xu",
    19.9 +include_dirs = [ XEN_ROOT + "/tools/python/xen/lowlevel/xu",
   19.10                   XEN_ROOT + "/tools/libxc",
   19.11                   XEN_ROOT + "/tools/libxutil",
   19.12                   ]
    20.1 --- a/tools/python/xen/lowlevel/xu/xu.c	Tue Nov 02 02:19:19 2004 +0000
    20.2 +++ b/tools/python/xen/lowlevel/xu/xu.c	Tue Nov 02 09:08:37 2004 +0000
    20.3 @@ -25,8 +25,7 @@
    20.4  
    20.5  #include <xen/xen.h>
    20.6  #include <xen/io/domain_controller.h>
    20.7 -
    20.8 -#include <asm-xen/proc_cmd.h>
    20.9 +#include <xen/linux/privcmd.h>
   20.10  
   20.11  #define XENPKG "xen.lowlevel.xu"
   20.12  
    21.1 --- a/tools/xentrace/Makefile	Tue Nov 02 02:19:19 2004 +0000
    21.2 +++ b/tools/xentrace/Makefile	Tue Nov 02 09:08:37 2004 +0000
    21.3 @@ -5,7 +5,6 @@ include $(XEN_ROOT)/tools/Make.defs
    21.4  CC       = gcc
    21.5  CFLAGS   = -Wall -Werror -O3
    21.6  
    21.7 -CFLAGS  += -I $(XEN_LINUX_INCLUDE)
    21.8  CFLAGS  += -I $(XEN_XC)
    21.9  CFLAGS  += -I $(XEN_LIBXC)
   21.10  CFLAGS  += -I $(XEN_LIBXUTIL)
    22.1 --- a/tools/xfrd/Makefile	Tue Nov 02 02:19:19 2004 +0000
    22.2 +++ b/tools/xfrd/Makefile	Tue Nov 02 09:08:37 2004 +0000
    22.3 @@ -9,9 +9,6 @@ include $(XEN_ROOT)/tools/Make.defs
    22.4  
    22.5  XFRD_INSTALL_DIR = /usr/sbin
    22.6  
    22.7 -vpath %h       $(XEN_LINUX_INCLUDE)
    22.8 -INCLUDES += -I $(XEN_LINUX_INCLUDE)
    22.9 -
   22.10  vpath %.h      $(XEN_LIBXC)
   22.11  INCLUDES += -I $(XEN_LIBXC)
   22.12