ia64/xen-unstable

changeset 4382:98982c364df7

bitkeeper revision 1.1236.1.161 (424a87d38l7A3H0bMHl_fsQl_ZRvuA)

Remove vmassist dom0_op. Can now adjust vm assists via setdomaininfo.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Mar 30 11:04:51 2005 +0000 (2005-03-30)
parents 85103482f510
children a29cd6727132
files tools/libxc/xc.h tools/libxc/xc_domain.c xen/common/dom0_ops.c xen/include/public/dom0_ops.h
line diff
     1.1 --- a/tools/libxc/xc.h	Wed Mar 30 10:57:35 2005 +0000
     1.2 +++ b/tools/libxc/xc.h	Wed Mar 30 11:04:51 2005 +0000
     1.3 @@ -375,11 +375,6 @@ int xc_domain_setmaxmem(int xc_handle,
     1.4                          u32 domid, 
     1.5                          unsigned int max_memkb);
     1.6  
     1.7 -int xc_domain_setvmassist(int xc_handle,
     1.8 -                          u32 domid, 
     1.9 -                          unsigned int cmd,
    1.10 -                          unsigned int type);
    1.11 -
    1.12  typedef dom0_perfc_desc_t xc_perfc_desc_t;
    1.13  /* IMPORTANT: The caller is responsible for mlock()'ing the @desc array. */
    1.14  int xc_perfc_control(int xc_handle,
     2.1 --- a/tools/libxc/xc_domain.c	Wed Mar 30 10:57:35 2005 +0000
     2.2 +++ b/tools/libxc/xc_domain.c	Wed Mar 30 11:04:51 2005 +0000
     2.3 @@ -243,16 +243,3 @@ int xc_domain_setmaxmem(int xc_handle,
     2.4      op.u.setdomainmaxmem.max_memkb = max_memkb;
     2.5      return do_dom0_op(xc_handle, &op);
     2.6  }
     2.7 -
     2.8 -int xc_domain_setvmassist(int xc_handle,
     2.9 -                          u32 domid, 
    2.10 -                          unsigned int cmd,
    2.11 -                          unsigned int type)
    2.12 -{
    2.13 -    dom0_op_t op;
    2.14 -    op.cmd = DOM0_SETDOMAINVMASSIST;
    2.15 -    op.u.setdomainvmassist.domain = (domid_t)domid;
    2.16 -    op.u.setdomainvmassist.cmd = cmd;
    2.17 -    op.u.setdomainvmassist.type = type;
    2.18 -    return do_dom0_op(xc_handle, &op);
    2.19 -}
     3.1 --- a/xen/common/dom0_ops.c	Wed Mar 30 10:57:35 2005 +0000
     3.2 +++ b/xen/common/dom0_ops.c	Wed Mar 30 11:04:51 2005 +0000
     3.3 @@ -451,21 +451,6 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
     3.4      }
     3.5      break;
     3.6  
     3.7 -    case DOM0_SETDOMAINVMASSIST:
     3.8 -    {
     3.9 -        struct domain *d; 
    3.10 -        ret = -ESRCH;
    3.11 -        d = find_domain_by_id( op->u.setdomainvmassist.domain );
    3.12 -        if ( d != NULL )
    3.13 -        {
    3.14 -            vm_assist(d, op->u.setdomainvmassist.cmd,
    3.15 -                      op->u.setdomainvmassist.type);
    3.16 -            put_domain(d);
    3.17 -            ret = 0;
    3.18 -        }
    3.19 -    }
    3.20 -    break;
    3.21 -
    3.22  #ifdef PERF_COUNTERS
    3.23      case DOM0_PERFCCONTROL:
    3.24      {
     4.1 --- a/xen/include/public/dom0_ops.h	Wed Mar 30 10:57:35 2005 +0000
     4.2 +++ b/xen/include/public/dom0_ops.h	Wed Mar 30 11:04:51 2005 +0000
     4.3 @@ -320,15 +320,6 @@ typedef struct {
     4.4      MEMORY_PADDING;
     4.5  } PACKED dom0_getpageframeinfo2_t; /* 24 bytes */
     4.6  
     4.7 -#define DOM0_SETDOMAINVMASSIST   30
     4.8 -typedef struct {
     4.9 -    /* IN variables. */
    4.10 -    domid_t      domain;              /*  0 */
    4.11 -    u16          __pad0;
    4.12 -    u32          cmd;                 /*  4: vm_assist cmd */
    4.13 -    u32          type;                /*  8: vm_assist cmd */
    4.14 -} PACKED dom0_setdomainvmassist_t; /* 12 bytes */
    4.15 -
    4.16  /*
    4.17   * Request memory range (@pfn, @pfn+@nr_pfns-1) to have type @type.
    4.18   * On x86, @type is an architecture-defined MTRR memory type.
    4.19 @@ -443,7 +434,6 @@ typedef struct {
    4.20  	dom0_setdomaininitialmem_t setdomaininitialmem;
    4.21  	dom0_setdomainmaxmem_t   setdomainmaxmem;
    4.22  	dom0_getpageframeinfo2_t getpageframeinfo2;
    4.23 -	dom0_setdomainvmassist_t setdomainvmassist;
    4.24          dom0_add_memtype_t       add_memtype;
    4.25          dom0_del_memtype_t       del_memtype;
    4.26          dom0_read_memtype_t      read_memtype;