ia64/xen-unstable

changeset 482:a7588afbdfe5

bitkeeper revision 1.256 (3ee609bdneehgPlYzveJg2IZOvjyUg)

dom0_ops.h:
new file
dom0_ops.h, sched.h, kernel.c, domain.c, dom0_ops.c:
Clean up dom0_ops.h interface files to remove duplicated definitions.
dom0_ops.h:
Rename: xen/include/xeno/dom0_ops.h -> xen/include/hypervisor-ifs/dom0_ops.h
.del-dom0_ops.h~ede4a9057a132248:
Delete: tools/internal/dom0_ops.h
.del-dom0_ops.h~d7d8e37e7e6347c6:
Delete: tools/domain_builder/dom0_ops.h
author kaf24@scramble.cl.cam.ac.uk
date Tue Jun 10 16:39:25 2003 +0000 (2003-06-10)
parents 0aef664789c0
children 0d6b14f25be6
files .bk-to-hg .hg-to-bk .rootkeys tools/domain_builder/dom0_ops.h tools/internal/dom0_ops.h xen/common/dom0_ops.c xen/common/domain.c xen/common/kernel.c xen/include/hypervisor-ifs/dom0_ops.h xen/include/xeno/dom0_ops.h xen/include/xeno/sched.h xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/dom0/dom0_ops.h
line diff
     1.1 --- a/.bk-to-hg	Tue Jun 10 15:18:45 2003 +0000
     1.2 +++ b/.bk-to-hg	Tue Jun 10 16:39:25 2003 +0000
     1.3 @@ -1,8 +1,2 @@
     1.4 -#!/bin/sh -x
     1.5 -set -e
     1.6 -test -L tools/domain_builder/dom0_ops.h
     1.7 -rm      tools/domain_builder/dom0_ops.h
     1.8 -test -L tools/internal/dom0_ops.h
     1.9 -rm      tools/internal/dom0_ops.h
    1.10 -(find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true
    1.11 +#!/bin/sh
    1.12  exit 0
     2.1 --- a/.hg-to-bk	Tue Jun 10 15:18:45 2003 +0000
     2.2 +++ b/.hg-to-bk	Tue Jun 10 16:39:25 2003 +0000
     2.3 @@ -1,9 +1,2 @@
     2.4 -#!/bin/sh -x
     2.5 -set -e
     2.6 -mkdir -p tools
     2.7 -mkdir -p tools/domain_builder
     2.8 -ln -s ../../xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/dom0/dom0_ops.h tools/domain_builder/dom0_ops.h
     2.9 -mkdir -p tools/internal
    2.10 -ln -s ../../xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/dom0/dom0_ops.h tools/internal/dom0_ops.h
    2.11 -(find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true
    2.12 +#!/bin/sh
    2.13  exit 0
     3.1 --- a/.rootkeys	Tue Jun 10 15:18:45 2003 +0000
     3.2 +++ b/.rootkeys	Tue Jun 10 16:39:25 2003 +0000
     3.3 @@ -90,7 +90,7 @@ 3ec41f7e1ZpfCsgQ2qRJBooBn_iRtA tools/con
     3.4  3e4d00468-FN2VDeEHo96zxrMHK_mA tools/domain_builder/Makefile
     3.5  3e4d0046SPau_y0sw2WLJz8QkqNoRA tools/domain_builder/README
     3.6  3e4d0046bbdH0GsI9J_1Eb4ZQHfIiQ tools/domain_builder/dom0_defs.h
     3.7 -3e71f9b871pvOAxDrhxpC4N4mHkbww tools/domain_builder/dom0_ops.h
     3.8 +3ee609abdxnu1GvbtXnPlMfEkTEIwQ tools/domain_builder/dom0_ops.h
     3.9  3e4d0046ouLij_CMN_j7-dUHZIBI_A tools/domain_builder/dom_builder.c
    3.10  3e4d0046EKs06fY0CWDEgZQcn7DYUg tools/domain_builder/dom_kill.c
    3.11  3e4d0046aPbGiRTtdWxqY5b3ytWurA tools/domain_builder/hypervisor_defs.h
    3.12 @@ -100,7 +100,7 @@ 3e4d0046VHhXwFuG5FK34AVxqd5A_A tools/dom
    3.13  3e4d0046IBzDIeaMbQB-e2QB2ahbig tools/domain_builder/vifinit
    3.14  3eb781fdl4lXWYZzmqDDUAYhAThRqQ tools/internal/Makefile
    3.15  3eb781fdc539MQQm47rYRCCR3N5i-Q tools/internal/dom0_defs.h
    3.16 -3eb781fdEYILyFg60YVBsWNqxWFf1g tools/internal/dom0_ops.h
    3.17 +3ee609b3Yr4aggmLSKmhiIzT8-nURA tools/internal/dom0_ops.h
    3.18  3eb781fddjylXbsepjppUyIXa5lcaQ tools/internal/hypervisor_defs.h
    3.19  3eb781fdKiQbgozBsgs_zzJQ9ubehw tools/internal/mem_defs.h
    3.20  3ec61e1bJCeJJu0SsptmDpA1xKvwvw tools/internal/rpm.spec
    3.21 @@ -373,6 +373,7 @@ 3ddb79c4HugMq7IYGxcQKFBpKwKhzA xen/inclu
    3.22  3ddb79c3M2n1ROZH6xk3HbyN4CPDqg xen/include/asm-i386/uaccess.h
    3.23  3ddb79c3uPGcP_l_2xyGgBSWd5aC-Q xen/include/asm-i386/unaligned.h
    3.24  3ddb79c2YTaZwOqWin9-QNgHge5RVw xen/include/hypervisor-ifs/block.h
    3.25 +3ddb79c2PMeWTK86y4C3F4MzHw4A1g xen/include/hypervisor-ifs/dom0_ops.h
    3.26  3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/hypervisor-ifs/hypervisor-if.h
    3.27  3ead095dE_VF-QA88rl_5cWYRWtRVQ xen/include/hypervisor-ifs/kbd.h
    3.28  3ddb79c2oRPrzClk3zbTkRHlpumzKA xen/include/hypervisor-ifs/network.h
    3.29 @@ -399,7 +400,6 @@ 3ddb79c259jh8hE7vre_8NuE7nwNSA xen/inclu
    3.30  3eb165e0eawr3R-p2ZQtSdLWtLRN_A xen/include/xeno/console.h
    3.31  3ddb79c1V44RD26YqCUm-kqIupM37A xen/include/xeno/ctype.h
    3.32  3ddb79c05DdHQ0UxX_jKsXdR4QlMCA xen/include/xeno/delay.h
    3.33 -3ddb79c2PMeWTK86y4C3F4MzHw4A1g xen/include/xeno/dom0_ops.h
    3.34  3e6377eaioRoNm0m_HSDEAd4Vqrq_w xen/include/xeno/dom_mem_ops.h
    3.35  3ddb79c1uaWQZj551j1O0B5z8AnHOg xen/include/xeno/elevator.h
    3.36  3ddb79c0HIghfBF8zFUdmXhOU8i6hA xen/include/xeno/errno.h
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/tools/domain_builder/dom0_ops.h	Tue Jun 10 16:39:25 2003 +0000
     4.3 @@ -0,0 +1,5 @@
     4.4 +
     4.5 +#define NO_DOM0_OP_T
     4.6 +#include "../../xen/include/hypervisor-ifs/dom0_ops.h"
     4.7 +#undef  NO_DOM0_OP_T
     4.8 +#include "../../xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/dom0/dom0_ops.h"
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/tools/internal/dom0_ops.h	Tue Jun 10 16:39:25 2003 +0000
     5.3 @@ -0,0 +1,5 @@
     5.4 +
     5.5 +#define NO_DOM0_OP_T
     5.6 +#include "../../xen/include/hypervisor-ifs/dom0_ops.h"
     5.7 +#undef  NO_DOM0_OP_T
     5.8 +#include "../../xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/dom0/dom0_ops.h"
     6.1 --- a/xen/common/dom0_ops.c	Tue Jun 10 15:18:45 2003 +0000
     6.2 +++ b/xen/common/dom0_ops.c	Tue Jun 10 16:39:25 2003 +0000
     6.3 @@ -10,7 +10,7 @@
     6.4  #include <xeno/types.h>
     6.5  #include <xeno/lib.h>
     6.6  #include <xeno/mm.h>
     6.7 -#include <xeno/dom0_ops.h>
     6.8 +#include <hypervisor-ifs/dom0_ops.h>
     6.9  #include <xeno/sched.h>
    6.10  #include <xeno/event.h>
    6.11  #include <asm/domain_page.h>
     7.1 --- a/xen/common/domain.c	Tue Jun 10 15:18:45 2003 +0000
     7.2 +++ b/xen/common/domain.c	Tue Jun 10 16:39:25 2003 +0000
     7.3 @@ -9,7 +9,7 @@
     7.4  #include <xeno/delay.h>
     7.5  #include <xeno/event.h>
     7.6  #include <xeno/time.h>
     7.7 -#include <xeno/dom0_ops.h>
     7.8 +#include <hypervisor-ifs/dom0_ops.h>
     7.9  #include <asm/io.h>
    7.10  #include <asm/domain_page.h>
    7.11  #include <asm/flushtlb.h>
     8.1 --- a/xen/common/kernel.c	Tue Jun 10 15:18:45 2003 +0000
     8.2 +++ b/xen/common/kernel.c	Tue Jun 10 16:39:25 2003 +0000
     8.3 @@ -13,7 +13,7 @@
     8.4  #include <asm/io.h>
     8.5  #include <asm/msr.h>
     8.6  #include <asm/uaccess.h>
     8.7 -#include <xeno/dom0_ops.h>
     8.8 +#include <hypervisor-ifs/dom0_ops.h>
     8.9  #include <asm/byteorder.h>
    8.10  #include <linux/if_ether.h>
    8.11  #include <asm/domain_page.h>
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/xen/include/hypervisor-ifs/dom0_ops.h	Tue Jun 10 16:39:25 2003 +0000
     9.3 @@ -0,0 +1,107 @@
     9.4 +/******************************************************************************
     9.5 + * dom0_ops.h
     9.6 + * 
     9.7 + * Process command requests from domain-0 guest OS.
     9.8 + * 
     9.9 + * Copyright (c) 2002-2003, K A Fraser, B Dragovic
    9.10 + */
    9.11 +
    9.12 +
    9.13 +#ifndef __DOM0_OPS_H__
    9.14 +#define __DOM0_OPS_H__
    9.15 +
    9.16 +#define DOM0_GETMEMLIST     2
    9.17 +#define DOM0_BVTCTL         6
    9.18 +#define DOM0_ADJUSTDOM      7
    9.19 +#define DOM0_CREATEDOMAIN   8
    9.20 +#define DOM0_DESTROYDOMAIN  9
    9.21 +#define DOM0_STARTDOMAIN   10
    9.22 +#define DOM0_STOPDOMAIN    11
    9.23 +#define DOM0_GETDOMAININFO 12
    9.24 +#define DOM0_BUILDDOMAIN   13
    9.25 +
    9.26 +#define MAX_CMD_LEN    256
    9.27 +#define MAX_DOMAIN_NAME 16
    9.28 +
    9.29 +typedef struct dom0_newdomain_st 
    9.30 +{
    9.31 +    unsigned int domain;    // return parameter
    9.32 +    unsigned int memory_kb; 
    9.33 +    unsigned int num_vifs;  // temporary
    9.34 +    unsigned long pg_head;  // return parameter
    9.35 +    char name[MAX_DOMAIN_NAME];
    9.36 +} dom0_newdomain_t;
    9.37 +
    9.38 +typedef struct dom0_killdomain_st
    9.39 +{
    9.40 +    unsigned int domain;
    9.41 +    int          force;
    9.42 +} dom0_killdomain_t;
    9.43 +
    9.44 +typedef struct dom0_getmemlist_st
    9.45 +{
    9.46 +    unsigned long start_pfn;
    9.47 +    unsigned long num_pfns;
    9.48 +    void *buffer;
    9.49 +} dom0_getmemlist_t;
    9.50 +
    9.51 +typedef struct domain_launch
    9.52 +{
    9.53 +    unsigned int domain;
    9.54 +    unsigned long l2_pgt_addr;
    9.55 +    unsigned long virt_load_addr;
    9.56 +    unsigned long virt_shinfo_addr;
    9.57 +    unsigned long virt_startinfo_addr;
    9.58 +    unsigned int num_vifs;
    9.59 +    char cmd_line[MAX_CMD_LEN];
    9.60 +    unsigned long virt_mod_addr;
    9.61 +    unsigned long virt_mod_len;
    9.62 +} dom_meminfo_t;
    9.63 +
    9.64 +typedef struct dom0_bvtctl_st
    9.65 +{
    9.66 +	unsigned long ctx_allow;	/* context switch allowance */
    9.67 +} dom0_bvtctl_t;
    9.68 +
    9.69 +typedef struct dom0_adjustdom_st
    9.70 +{
    9.71 +    unsigned int  domain;	/* domain id */
    9.72 +	unsigned long mcu_adv;	/* mcu advance: inverse of weight */
    9.73 +	unsigned long warp;     /* time warp */
    9.74 +	unsigned long warpl;    /* warp limit */
    9.75 +	unsigned long warpu;    /* unwarp time requirement */
    9.76 +} dom0_adjustdom_t;
    9.77 +
    9.78 +typedef struct dom0_getdominfo_st
    9.79 +{
    9.80 +  unsigned int domain;          /* All returns except domain */
    9.81 +  char name[MAX_DOMAIN_NAME];
    9.82 +  int processor;
    9.83 +  int has_cpu;
    9.84 +  int state;
    9.85 +  int hyp_events;
    9.86 +  unsigned long mcu_advance;
    9.87 +  unsigned long pg_head;
    9.88 +  unsigned int tot_pages;
    9.89 +  long long cpu_time;
    9.90 +} dom0_getdominfo_t;
    9.91 +
    9.92 +#ifndef NO_DOM0_OP_T
    9.93 +typedef struct dom0_op_st
    9.94 +{
    9.95 +    unsigned long cmd;
    9.96 +    union
    9.97 +    {
    9.98 +        dom0_newdomain_t newdomain;
    9.99 +        dom0_killdomain_t killdomain;
   9.100 +        dom0_getmemlist_t getmemlist;
   9.101 +		dom0_bvtctl_t bvtctl;
   9.102 +		dom0_adjustdom_t adjustdom;
   9.103 +        dom_meminfo_t meminfo;
   9.104 +        dom0_getdominfo_t getdominfo;
   9.105 +   }
   9.106 +    u;
   9.107 +} dom0_op_t;
   9.108 +#endif
   9.109 +
   9.110 +#endif
    10.1 --- a/xen/include/xeno/dom0_ops.h	Tue Jun 10 15:18:45 2003 +0000
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,108 +0,0 @@
    10.4 -/******************************************************************************
    10.5 - * dom0_ops.h
    10.6 - * 
    10.7 - * Process command requests from domain-0 guest OS.
    10.8 - * 
    10.9 - * Copyright (c) 2002, K A Fraser, B Dragovic
   10.10 - * 
   10.11 - * MUST BE KEPT IN SYNC WITH xenolinux<*>/arch/xeno/drivers/dom0/dom0_ops.h
   10.12 - */
   10.13 -
   10.14 -
   10.15 -#ifndef __DOM0_OPS_H__
   10.16 -#define __DOM0_OPS_H__
   10.17 -
   10.18 -#define DOM0_GETMEMLIST     2
   10.19 -#define DOM0_BVTCTL         6
   10.20 -#define DOM0_ADJUSTDOM      7
   10.21 -#define DOM0_CREATEDOMAIN   8
   10.22 -#define DOM0_DESTROYDOMAIN  9
   10.23 -#define DOM0_STARTDOMAIN   10
   10.24 -#define DOM0_STOPDOMAIN    11
   10.25 -#define DOM0_GETDOMAININFO 12
   10.26 -#define DOM0_BUILDDOMAIN   13
   10.27 -
   10.28 -#define MAX_CMD_LEN    256
   10.29 -#define MAX_DOMAIN_NAME 16
   10.30 -
   10.31 -typedef struct dom0_newdomain_st 
   10.32 -{
   10.33 -    unsigned int domain;    // return parameter
   10.34 -    unsigned int memory_kb; 
   10.35 -    unsigned int num_vifs;  // temporary
   10.36 -    unsigned long pg_head;  // return parameter
   10.37 -    char name[MAX_DOMAIN_NAME];
   10.38 -} dom0_newdomain_t;
   10.39 -
   10.40 -typedef struct dom0_killdomain_st
   10.41 -{
   10.42 -    unsigned int domain;
   10.43 -    int          force;
   10.44 -} dom0_killdomain_t;
   10.45 -
   10.46 -typedef struct dom0_getmemlist_st
   10.47 -{
   10.48 -    unsigned long start_pfn;
   10.49 -    unsigned long num_pfns;
   10.50 -    void *buffer;
   10.51 -} dom0_getmemlist_t;
   10.52 -
   10.53 -typedef struct domain_launch
   10.54 -{
   10.55 -    unsigned int domain;
   10.56 -    unsigned long l2_pgt_addr;
   10.57 -    unsigned long virt_load_addr;
   10.58 -    unsigned long virt_shinfo_addr;
   10.59 -    unsigned long virt_startinfo_addr;
   10.60 -    unsigned int num_vifs;
   10.61 -    char cmd_line[MAX_CMD_LEN];
   10.62 -    unsigned long virt_mod_addr;
   10.63 -    unsigned long virt_mod_len;
   10.64 -} dom_meminfo_t;
   10.65 -
   10.66 -typedef struct dom0_bvtctl_st
   10.67 -{
   10.68 -	unsigned long ctx_allow;	/* context switch allowance */
   10.69 -} dom0_bvtctl_t;
   10.70 -
   10.71 -typedef struct dom0_adjustdom_st
   10.72 -{
   10.73 -    unsigned int  domain;	/* domain id */
   10.74 -	unsigned long mcu_adv;	/* mcu advance: inverse of weight */
   10.75 -	unsigned long warp;     /* time warp */
   10.76 -	unsigned long warpl;    /* warp limit */
   10.77 -	unsigned long warpu;    /* unwarp time requirement */
   10.78 -} dom0_adjustdom_t;
   10.79 -
   10.80 -typedef struct dom0_getdominfo_st
   10.81 -{
   10.82 -  unsigned int domain;          /* All returns except domain */
   10.83 -  char name[MAX_DOMAIN_NAME];
   10.84 -  int processor;
   10.85 -  int has_cpu;
   10.86 -  int state;
   10.87 -  int hyp_events;
   10.88 -  unsigned long mcu_advance;
   10.89 -  unsigned long pg_head;
   10.90 -  unsigned int tot_pages;
   10.91 -  long long cpu_time;
   10.92 -} dom0_getdominfo_t;
   10.93 -
   10.94 -
   10.95 -typedef struct dom0_op_st
   10.96 -{
   10.97 -    unsigned long cmd;
   10.98 -    union
   10.99 -    {
  10.100 -        dom0_newdomain_t newdomain;
  10.101 -        dom0_killdomain_t killdomain;
  10.102 -        dom0_getmemlist_t getmemlist;
  10.103 -		dom0_bvtctl_t bvtctl;
  10.104 -		dom0_adjustdom_t adjustdom;
  10.105 -        dom_meminfo_t meminfo;
  10.106 -        dom0_getdominfo_t getdominfo;
  10.107 -   }
  10.108 -    u;
  10.109 -} dom0_op_t;
  10.110 -
  10.111 -#endif
    11.1 --- a/xen/include/xeno/sched.h	Tue Jun 10 15:18:45 2003 +0000
    11.2 +++ b/xen/include/xeno/sched.h	Tue Jun 10 16:39:25 2003 +0000
    11.3 @@ -10,7 +10,7 @@
    11.4  #include <asm/processor.h>
    11.5  #include <asm/current.h>
    11.6  #include <hypervisor-ifs/hypervisor-if.h>
    11.7 -#include <xeno/dom0_ops.h>
    11.8 +#include <hypervisor-ifs/dom0_ops.h>
    11.9  
   11.10  #include <xeno/list.h>
   11.11  #include <xeno/time.h>
    12.1 --- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/dom0/dom0_ops.h	Tue Jun 10 15:18:45 2003 +0000
    12.2 +++ b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/dom0/dom0_ops.h	Tue Jun 10 16:39:25 2003 +0000
    12.3 @@ -2,66 +2,26 @@
    12.4   * dom0_ops.h
    12.5   * 
    12.6   * Process command requests from domain-0 guest OS.
    12.7 + * This file includes the Xen part of the interface, plus the extra stuff
    12.8 + * that is dealt with by Xenolinux without being handed down to Xen.
    12.9   * 
   12.10 - * Copyright (c) 2002, K A Fraser, B Dragovic
   12.11 - * 
   12.12 - * MUST BE KEPT IN SYNC WITH xen/include/xeno/dom0_ops.h
   12.13 - * MUST BE KEPT IN SYNC WITH tools/domain_builder/dom0_ops.h
   12.14 + * Copyright (c) 2002-2003, K A Fraser, B Dragovic
   12.15   */
   12.16  
   12.17 -#define DOM0_GETMEMLIST     2
   12.18 -#define DOM0_BVTCTL         6
   12.19 -#define DOM0_ADJUSTDOM      7
   12.20 -#define DOM0_CREATEDOMAIN   8
   12.21 -#define DOM0_DESTROYDOMAIN  9
   12.22 -#define DOM0_STARTDOMAIN   10
   12.23 -#define DOM0_STOPDOMAIN    11
   12.24 -#define DOM0_GETDOMAININFO 12
   12.25 -#define DOM0_BUILDDOMAIN   13
   12.26 -#define MAP_DOM_MEM        14 /* Not passed down to Xen */
   12.27 -#define DO_PGUPDATES       15 /* Not passed down to Xen */
   12.28 +#ifndef __DOM0_DOM0_OPS_H__
   12.29 +#define __DOM0_DOM0_OPS_H__
   12.30 +
   12.31 +/* External users of this header file will include Xen's version separately. */
   12.32 +#ifdef __KERNEL__
   12.33 +#define NO_DOM0_OP_T
   12.34 +#include <asm/hypervisor-ifs/dom0_ops.h>
   12.35 +#endif
   12.36 +
   12.37 +/* Extra commands dealt with by Xenolinux. */
   12.38 +#define MAP_DOM_MEM        14
   12.39 +#define DO_PGUPDATES       15
   12.40  #define MAX_CMD            16
   12.41  
   12.42 -#define MAX_CMD_LEN     256
   12.43 -#define MAX_DOMAIN_NAME 16
   12.44 -
   12.45 -typedef struct dom0_newdomain_st
   12.46 -{
   12.47 -    unsigned int domain;
   12.48 -    unsigned int memory_kb;
   12.49 -    unsigned int num_vifs;  /* temporary */
   12.50 -    unsigned long pg_head;  /* return parameter */
   12.51 -    char name[MAX_DOMAIN_NAME];
   12.52 -} dom0_newdomain_t;
   12.53 -
   12.54 -typedef struct dom0_killdomain_st
   12.55 -{
   12.56 -    unsigned int domain;
   12.57 -    int          force;
   12.58 -} dom0_killdomain_t;
   12.59 -
   12.60 -typedef struct dom0_getmemlist_st
   12.61 -{
   12.62 -    unsigned long start_pfn;
   12.63 -    unsigned long num_pfns;
   12.64 -    void *buffer;
   12.65 -} dom0_getmemlist_t;
   12.66 -
   12.67 -typedef struct dom0_bvtctl_st
   12.68 -{
   12.69 -    unsigned long ctx_allow;    /* context switch allowance */
   12.70 -} dom0_bvtctl_t;
   12.71 -
   12.72 -typedef struct dom0_adjustdom_st
   12.73 -{
   12.74 -    unsigned int  domain;   /* domain id */
   12.75 -    unsigned long mcu_adv;  /* mcu advance: inverse of weight */
   12.76 -    unsigned long warp;     /* time warp */
   12.77 -    unsigned long warpl;    /* warp limit */
   12.78 -    unsigned long warpu;    /* unwarp time requirement */
   12.79 -} dom0_adjustdom_t;
   12.80 -
   12.81 -/* This is entirely processed by XenoLinux */
   12.82  typedef struct dom_mem 
   12.83  {
   12.84      unsigned int domain;
   12.85 @@ -70,42 +30,12 @@ typedef struct dom_mem
   12.86      int tot_pages;
   12.87  } dom_mem_t;
   12.88  
   12.89 -/* This is entirely processed by XenoLinux */
   12.90  typedef struct dom_pgupdate
   12.91  {
   12.92      unsigned long pgt_update_arr;
   12.93      unsigned long num_pgt_updates;
   12.94  } dom_pgupdate_t;
   12.95  
   12.96 -typedef struct domain_launch
   12.97 -{
   12.98 -    unsigned int domain;
   12.99 -    unsigned long l2_pgt_addr;
  12.100 -    unsigned long virt_load_addr;
  12.101 -    unsigned long virt_shinfo_addr;
  12.102 -    unsigned long virt_startinfo_addr;
  12.103 -    unsigned int num_vifs;
  12.104 -    char cmd_line[MAX_CMD_LEN];
  12.105 -    unsigned long virt_mod_addr;
  12.106 -    unsigned long virt_mod_len;
  12.107 -} dom_meminfo_t;
  12.108 -
  12.109 -
  12.110 -typedef struct dom0_getdominfo_st
  12.111 -{
  12.112 -  unsigned int domain;          /* All returns except domain */
  12.113 -  char name[MAX_DOMAIN_NAME];
  12.114 -  int processor;
  12.115 -  int has_cpu;
  12.116 -  int state;
  12.117 -  int hyp_events;
  12.118 -  unsigned long mcu_advance;
  12.119 -  unsigned long pg_head;
  12.120 -  unsigned int tot_pages;
  12.121 -  long long cpu_time;
  12.122 -} dom0_getdominfo_t;
  12.123 -
  12.124 -
  12.125  typedef struct dom0_op_st
  12.126  {
  12.127      unsigned long cmd;
  12.128 @@ -124,3 +54,4 @@ typedef struct dom0_op_st
  12.129      u;
  12.130  } dom0_op_t;
  12.131  
  12.132 +#endif /* __DOM0_DOM0_OPS_H__ */