ia64/xen-unstable

changeset 7439:c08e7f0b1ee5

merge
author kaf24@firebug.cl.cam.ac.uk
date Wed Oct 19 13:42:55 2005 +0100 (2005-10-19)
parents 848f21d57278 74f693d6e03e
children 41489189b19e
files
line diff
     1.1 --- a/tools/examples/vif-bridge	Wed Oct 19 13:39:59 2005 +0100
     1.2 +++ b/tools/examples/vif-bridge	Wed Oct 19 13:42:55 2005 +0100
     1.3 @@ -31,11 +31,8 @@
     1.4  # rules for its ip addresses (if any).
     1.5  #============================================================================
     1.6  
     1.7 -# Exit if anything goes wrong
     1.8 -set -e 
     1.9 -export PATH=/sbin:/bin:/usr/bin:/usr/sbin:$PATH
    1.10 -
    1.11 -echo "*vif-bridge $*" >&2
    1.12 +dir=$(dirname "$0")
    1.13 +. "$dir/xen-hotplug-common.sh"
    1.14  
    1.15  # Operation name.
    1.16  OP=$1
     2.1 --- a/tools/examples/xen-hotplug-common.sh	Wed Oct 19 13:39:59 2005 +0100
     2.2 +++ b/tools/examples/xen-hotplug-common.sh	Wed Oct 19 13:42:55 2005 +0100
     2.3 @@ -1,6 +1,8 @@
     2.4  set -e
     2.5  
     2.6 -export PATH=/sbin:/bin:/usr/bin:/usr/sbin:$PATH
     2.7 +export PATH="/sbin:/bin:/usr/bin:/usr/sbin:$PATH"
     2.8 +export LANG="POSIX"
     2.9 +unset $(set | grep ^LC_ | cut -d= -f1)
    2.10  
    2.11  log() {
    2.12    local level="$1"
     3.1 --- a/tools/python/xen/lowlevel/xc/xc.c	Wed Oct 19 13:39:59 2005 +0100
     3.2 +++ b/tools/python/xen/lowlevel/xc/xc.c	Wed Oct 19 13:42:55 2005 +0100
     3.3 @@ -739,8 +739,8 @@ static PyObject *pyxc_xeninfo(PyObject *
     3.4  
     3.5  
     3.6  static PyObject *pyxc_sedf_domain_set(PyObject *self,
     3.7 -                                         PyObject *args,
     3.8 -                                         PyObject *kwds)
     3.9 +                                      PyObject *args,
    3.10 +                                      PyObject *kwds)
    3.11  {
    3.12      XcObject *xc = (XcObject *)self;
    3.13      uint32_t domid;
    3.14 @@ -762,8 +762,8 @@ static PyObject *pyxc_sedf_domain_set(Py
    3.15  }
    3.16  
    3.17  static PyObject *pyxc_sedf_domain_get(PyObject *self,
    3.18 -                                         PyObject *args,
    3.19 -                                         PyObject *kwds)
    3.20 +                                      PyObject *args,
    3.21 +                                      PyObject *kwds)
    3.22  {
    3.23      XcObject *xc = (XcObject *)self;
    3.24      uint32_t domid;
    3.25 @@ -779,12 +779,13 @@ static PyObject *pyxc_sedf_domain_get(Py
    3.26                                  &slice,&latency,&extratime,&weight) )
    3.27          return PyErr_SetFromErrno(xc_error);
    3.28  
    3.29 -    return Py_BuildValue("{s:i,s:L,s:L,s:L,s:i}",
    3.30 +    return Py_BuildValue("{s:i,s:L,s:L,s:L,s:i,s:i}",
    3.31                           "domain",    domid,
    3.32                           "period",    period,
    3.33                           "slice",     slice,
    3.34  			 "latency",   latency,
    3.35 -			 "extratime", extratime);
    3.36 +			 "extratime", extratime,
    3.37 +                         "weight",    weight);
    3.38  }
    3.39  
    3.40  static PyObject *pyxc_domain_setmaxmem(PyObject *self,
     4.1 --- a/tools/python/xen/xend/XendClient.py	Wed Oct 19 13:39:59 2005 +0100
     4.2 +++ b/tools/python/xen/xend/XendClient.py	Wed Oct 19 13:42:55 2005 +0100
     4.3 @@ -269,6 +269,10 @@ class Xend:
     4.4                                'warpl'    : warpl,
     4.5                                'warpu'    : warpu })
     4.6  
     4.7 +    def xend_domain_cpu_sedf_get(self, id):
     4.8 +        return self.xendPost(self.domainurl(id),
     4.9 +                             {'op' : 'cpu_sedf_get'})
    4.10 +
    4.11      def xend_domain_cpu_sedf_set(self, id, period, slice, latency, extratime, weight):
    4.12          return self.xendPost(self.domainurl(id),
    4.13                               {'op'        : 'cpu_sedf_set',
     5.1 --- a/tools/python/xen/xend/server/SrvDomain.py	Wed Oct 19 13:39:59 2005 +0100
     5.2 +++ b/tools/python/xen/xend/server/SrvDomain.py	Wed Oct 19 13:42:55 2005 +0100
     5.3 @@ -105,6 +105,13 @@ class SrvDomain(SrvDir):
     5.4          return val
     5.5      
     5.6      
     5.7 +    def op_cpu_sedf_get(self, op, req):
     5.8 +        fn = FormFn(self.xd.domain_cpu_sedf_get,
     5.9 +                    [['dom', 'int']])
    5.10 +        val = fn(req.args, {'dom': self.dom.domid})
    5.11 +        return val
    5.12 +
    5.13 +
    5.14      def op_cpu_sedf_set(self, op, req):
    5.15          fn = FormFn(self.xd.domain_cpu_sedf_set,
    5.16                      [['dom', 'int'],