ia64/xen-unstable

changeset 578:3539152a9fab

bitkeeper revision 1.321 (3f0c3721EPUc_lgxSWz2JlomJJPMtg)

Move XenoLinux-specific stuff from hypervisor interface
include files to XenoLinux include file.
author sos22@labyrinth.cl.cam.ac.uk
date Wed Jul 09 15:39:13 2003 +0000 (2003-07-09)
parents cc54519f9a1a
children 01725801761a
files .rootkeys tools/internal/Makefile tools/internal/xi_build.c tools/internal/xi_create.c xen/include/hypervisor-ifs/dom0_ops.h xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c xenolinux-2.4.21-sparse/include/asm-xeno/dom0.h
line diff
     1.1 --- a/.rootkeys	Wed Jul 09 15:28:07 2003 +0000
     1.2 +++ b/.rootkeys	Wed Jul 09 15:39:13 2003 +0000
     1.3 @@ -539,6 +539,7 @@ 3f05a939ZSKN7gX2sfTLzPcYJvPkcQ xenolinux
     1.4  3f05a939_I9vPADPgyVBwUDUxtoeOQ xenolinux-2.4.21-sparse/fs/partitions/xeno.h
     1.5  3e5a4e66wbeCpsJgVf_U8Jde-CNcsA xenolinux-2.4.21-sparse/include/asm-xeno/bugs.h
     1.6  3e5a4e66HdSkvIV6SJ1evG_xmTmXHA xenolinux-2.4.21-sparse/include/asm-xeno/desc.h
     1.7 +3f0c3721E5WAnbeoPp7PE35J_Ndxaw xenolinux-2.4.21-sparse/include/asm-xeno/dom0.h
     1.8  3e5a4e66SYp_UpAVcF8Lc1wa3Qtgzw xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h
     1.9  3e5a4e67w_DWgjIJ17Tlossu1LGujQ xenolinux-2.4.21-sparse/include/asm-xeno/highmem.h
    1.10  3e5a4e67YtcyDLQsShhCfQwPSELfvA xenolinux-2.4.21-sparse/include/asm-xeno/hw_irq.h
     2.1 --- a/tools/internal/Makefile	Wed Jul 09 15:28:07 2003 +0000
     2.2 +++ b/tools/internal/Makefile	Wed Jul 09 15:39:13 2003 +0000
     2.3 @@ -1,5 +1,5 @@
     2.4  CC = gcc
     2.5 -CFLAGS = -Wall -I../../xen/include
     2.6 +CFLAGS = -Wall -I../../xen/include -I../../xenolinux-2.4.21-sparse/include
     2.7  XI_CREATE = xi_create
     2.8  XI_START = xi_start
     2.9  XI_STOP = xi_stop
     3.1 --- a/tools/internal/xi_build.c	Wed Jul 09 15:28:07 2003 +0000
     3.2 +++ b/tools/internal/xi_build.c	Wed Jul 09 15:39:13 2003 +0000
     3.3 @@ -13,6 +13,7 @@
     3.4  #include <string.h>
     3.5  #include <stdlib.h>
     3.6  
     3.7 +#include "asm-xeno/dom0.h"
     3.8  #include "hypervisor-ifs/hypervisor-if.h"
     3.9  #include "dom0_ops.h"
    3.10  #include "dom0_defs.h"
     4.1 --- a/tools/internal/xi_create.c	Wed Jul 09 15:28:07 2003 +0000
     4.2 +++ b/tools/internal/xi_create.c	Wed Jul 09 15:39:13 2003 +0000
     4.3 @@ -19,6 +19,7 @@
     4.4  #include "dom0_ops.h"
     4.5  #include "dom0_defs.h"
     4.6  #include "mem_defs.h"
     4.7 +#include "asm-xeno/dom0.h"
     4.8  
     4.9  /***********************************************************************/
    4.10  
     5.1 --- a/xen/include/hypervisor-ifs/dom0_ops.h	Wed Jul 09 15:28:07 2003 +0000
     5.2 +++ b/xen/include/hypervisor-ifs/dom0_ops.h	Wed Jul 09 15:39:13 2003 +0000
     5.3 @@ -112,38 +112,4 @@ typedef struct dom0_op_st
     5.4  } dom0_op_t;
     5.5  #endif
     5.6  
     5.7 -/* These really belong in a Linux header file somewhere.
     5.8 -   XXX.
     5.9 -*/
    5.10 -#define IOCTL_DOM0_CREATEDOMAIN _IOC(_IOC_READ, 'x', 0, sizeof(struct dom0_createdomain_args))
    5.11 -#define IOCTL_DOM0_MAPDOMMEM _IOC(_IOC_READ, 'x', 1, sizeof(struct dom0_mapdommem_args))
    5.12 -#define IOCTL_DOM0_UNMAPDOMMEM _IOC(_IOC_READ, 'x', 2, sizeof(struct dom0_unmapdommem_args))
    5.13 -#define IOCTL_DOM0_DOPGUPDATES _IOC(_IOC_READ, 'x', 3, sizeof(struct dom0_dopgupdates_args))
    5.14 -
    5.15 -struct dom0_createdomain_args
    5.16 -{
    5.17 -    unsigned int kb_mem;
    5.18 -    const char *name;
    5.19 -};
    5.20 -
    5.21 -struct dom0_mapdommem_args
    5.22 -{
    5.23 -    unsigned int domain;
    5.24 -    unsigned start_pfn;
    5.25 -    unsigned tot_pages;  
    5.26 -};
    5.27 -
    5.28 -struct dom0_unmapdommem_args
    5.29 -{
    5.30 -    unsigned long vaddr;
    5.31 -    unsigned long start_pfn;
    5.32 -    unsigned long tot_pages;
    5.33 -};
    5.34 -
    5.35 -struct dom0_dopgupdates_args
    5.36 -{
    5.37 -    unsigned long pgt_update_arr;
    5.38 -    unsigned long num_pgt_updates;
    5.39 -};
    5.40 -
    5.41  #endif
     6.1 --- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c	Wed Jul 09 15:28:07 2003 +0000
     6.2 +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c	Wed Jul 09 15:39:13 2003 +0000
     6.3 @@ -29,6 +29,7 @@
     6.4  #include <asm/pgtable.h>
     6.5  #include <asm/uaccess.h>
     6.6  #include <asm/tlb.h>
     6.7 +#include <asm/dom0.h>
     6.8  
     6.9  #include "dom0_ops.h"
    6.10  
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/xenolinux-2.4.21-sparse/include/asm-xeno/dom0.h	Wed Jul 09 15:39:13 2003 +0000
     7.3 @@ -0,0 +1,36 @@
     7.4 +/* IOCTLs used when access /proc/xeno/dom0_cmd. */
     7.5 +#ifndef __DOM0_H__
     7.6 +#define __DOM0_H__
     7.7 +
     7.8 +#define IOCTL_DOM0_CREATEDOMAIN _IOC(_IOC_READ, 'x', 0, sizeof(struct dom0_createdomain_args))
     7.9 +#define IOCTL_DOM0_MAPDOMMEM _IOC(_IOC_READ, 'x', 1, sizeof(struct dom0_mapdommem_args))
    7.10 +#define IOCTL_DOM0_UNMAPDOMMEM _IOC(_IOC_READ, 'x', 2, sizeof(struct dom0_unmapdommem_args))
    7.11 +#define IOCTL_DOM0_DOPGUPDATES _IOC(_IOC_READ, 'x', 3, sizeof(struct dom0_dopgupdates_args))
    7.12 +
    7.13 +struct dom0_createdomain_args
    7.14 +{
    7.15 +    unsigned int kb_mem;
    7.16 +    const char *name;
    7.17 +};
    7.18 +
    7.19 +struct dom0_mapdommem_args
    7.20 +{
    7.21 +    unsigned int domain;
    7.22 +    unsigned start_pfn;
    7.23 +    unsigned tot_pages;  
    7.24 +};
    7.25 +
    7.26 +struct dom0_unmapdommem_args
    7.27 +{
    7.28 +    unsigned long vaddr;
    7.29 +    unsigned long start_pfn;
    7.30 +    unsigned long tot_pages;
    7.31 +};
    7.32 +
    7.33 +struct dom0_dopgupdates_args
    7.34 +{
    7.35 +    unsigned long pgt_update_arr;
    7.36 +    unsigned long num_pgt_updates;
    7.37 +};
    7.38 +
    7.39 +#endif __DOM0_H__ /* __DOM0_H__ */