# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID c08e7f0b1ee597381d8c0dcca8a1b915b31bbc96
# Parent 848f21d57278e296ba1f802a6189098c64b4c2d2
# Parent 74f693d6e03ec0d3c960d7acc552ec71c702163e
merge
diff -r 848f21d57278 -r c08e7f0b1ee5 tools/examples/vif-bridge
--- a/tools/examples/vif-bridge Wed Oct 19 12:39:59 2005
+++ b/tools/examples/vif-bridge Wed Oct 19 12:42:55 2005
@@ -31,11 +31,8 @@
# rules for its ip addresses (if any).
#============================================================================
-# Exit if anything goes wrong
-set -e
-export PATH=/sbin:/bin:/usr/bin:/usr/sbin:$PATH
-
-echo "*vif-bridge $*" >&2
+dir=$(dirname "$0")
+. "$dir/xen-hotplug-common.sh"
# Operation name.
OP=$1
diff -r 848f21d57278 -r c08e7f0b1ee5 tools/examples/xen-hotplug-common.sh
--- a/tools/examples/xen-hotplug-common.sh Wed Oct 19 12:39:59 2005
+++ b/tools/examples/xen-hotplug-common.sh Wed Oct 19 12:42:55 2005
@@ -1,6 +1,8 @@
set -e
-export PATH=/sbin:/bin:/usr/bin:/usr/sbin:$PATH
+export PATH="/sbin:/bin:/usr/bin:/usr/sbin:$PATH"
+export LANG="POSIX"
+unset $(set | grep ^LC_ | cut -d= -f1)
log() {
local level="$1"
diff -r 848f21d57278 -r c08e7f0b1ee5 tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c Wed Oct 19 12:39:59 2005
+++ b/tools/python/xen/lowlevel/xc/xc.c Wed Oct 19 12:42:55 2005
@@ -739,8 +739,8 @@
static PyObject *pyxc_sedf_domain_set(PyObject *self,
- PyObject *args,
- PyObject *kwds)
+ PyObject *args,
+ PyObject *kwds)
{
XcObject *xc = (XcObject *)self;
uint32_t domid;
@@ -762,8 +762,8 @@
}
static PyObject *pyxc_sedf_domain_get(PyObject *self,
- PyObject *args,
- PyObject *kwds)
+ PyObject *args,
+ PyObject *kwds)
{
XcObject *xc = (XcObject *)self;
uint32_t domid;
@@ -779,12 +779,13 @@
&slice,&latency,&extratime,&weight) )
return PyErr_SetFromErrno(xc_error);
- return Py_BuildValue("{s:i,s:L,s:L,s:L,s:i}",
+ return Py_BuildValue("{s:i,s:L,s:L,s:L,s:i,s:i}",
"domain", domid,
"period", period,
"slice", slice,
"latency", latency,
- "extratime", extratime);
+ "extratime", extratime,
+ "weight", weight);
}
static PyObject *pyxc_domain_setmaxmem(PyObject *self,
diff -r 848f21d57278 -r c08e7f0b1ee5 tools/python/xen/xend/XendClient.py
--- a/tools/python/xen/xend/XendClient.py Wed Oct 19 12:39:59 2005
+++ b/tools/python/xen/xend/XendClient.py Wed Oct 19 12:42:55 2005
@@ -268,6 +268,10 @@
'warpvalue': warpvalue,
'warpl' : warpl,
'warpu' : warpu })
+
+ def xend_domain_cpu_sedf_get(self, id):
+ return self.xendPost(self.domainurl(id),
+ {'op' : 'cpu_sedf_get'})
def xend_domain_cpu_sedf_set(self, id, period, slice, latency, extratime,
weight):
return self.xendPost(self.domainurl(id),
diff -r 848f21d57278 -r c08e7f0b1ee5 tools/python/xen/xend/server/SrvDomain.py
--- a/tools/python/xen/xend/server/SrvDomain.py Wed Oct 19 12:39:59 2005
+++ b/tools/python/xen/xend/server/SrvDomain.py Wed Oct 19 12:42:55 2005
@@ -105,6 +105,13 @@
return val
+ def op_cpu_sedf_get(self, op, req):
+ fn = FormFn(self.xd.domain_cpu_sedf_get,
+ [['dom', 'int']])
+ val = fn(req.args, {'dom': self.dom.domid})
+ return val
+
+
def op_cpu_sedf_set(self, op, req):
fn = FormFn(self.xd.domain_cpu_sedf_set,
[['dom', 'int'],
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home