# HG changeset patch
# User Tim Deegan <tim.deegan@xxxxxxxxxxxxx>
# Node ID 5bc0e9a506873482a0656a4fdda16096e37bb725
# Parent 7c5d1c37943813a047a25866a36f21263693ffb8
# Parent 3b7c45e3bf941c0e0f4b727740a0785a4c60ddbc
Merge
---
tools/examples/locking.sh | 2 +-
tools/ioemu/target-i386-dm/helper2.c | 4 ++--
tools/python/xen/xend/XendDomain.py | 12 +++++++++++-
tools/python/xen/xend/server/DevController.py | 2 +-
tools/python/xen/xm/main.py | 5 -----
5 files changed, 15 insertions(+), 10 deletions(-)
diff -r 7c5d1c379438 -r 5bc0e9a50687 tools/examples/locking.sh
--- a/tools/examples/locking.sh Thu Sep 21 15:00:50 2006 +0100
+++ b/tools/examples/locking.sh Thu Sep 21 15:04:29 2006 +0100
@@ -21,7 +21,7 @@
LOCK_SLEEPTIME=1
LOCK_SPINNING_RETRIES=5
-LOCK_RETRIES=10
+LOCK_RETRIES=100
LOCK_BASEDIR=/var/run/xen-hotplug
diff -r 7c5d1c379438 -r 5bc0e9a50687 tools/ioemu/target-i386-dm/helper2.c
--- a/tools/ioemu/target-i386-dm/helper2.c Thu Sep 21 15:00:50 2006 +0100
+++ b/tools/ioemu/target-i386-dm/helper2.c Thu Sep 21 15:04:29 2006 +0100
@@ -520,8 +520,8 @@ int main_loop(void)
}
}
- /* Wait up to 10 msec. */
- main_loop_wait(10);
+ /* Wait up to 100 msec. */
+ main_loop_wait(100);
if (env->send_event) {
env->send_event = 0;
diff -r 7c5d1c379438 -r 5bc0e9a50687 tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py Thu Sep 21 15:00:50 2006 +0100
+++ b/tools/python/xen/xend/XendDomain.py Thu Sep 21 15:04:29 2006 +0100
@@ -560,13 +560,23 @@ class XendDomain:
except Exception, ex:
raise XendError(str(ex))
- def domain_sched_credit_set(self, domid, weight, cap):
+ def domain_sched_credit_set(self, domid, weight = None, cap = None):
"""Set credit scheduler parameters for a domain.
"""
dominfo = self.domain_lookup_by_name_or_id_nr(domid)
if not dominfo:
raise XendInvalidDomain(str(domid))
try:
+ if weight is None:
+ weight = int(0)
+ elif weight < 1 or weight > 65535:
+ raise XendError("weight is out of range")
+
+ if cap is None:
+ cap = int(~0)
+ elif cap < 0 or cap > dominfo.getVCpuCount() * 100:
+ raise XendError("cap is out of range")
+
return xc.sched_credit_domain_set(dominfo.getDomid(), weight, cap)
except Exception, ex:
raise XendError(str(ex))
diff -r 7c5d1c379438 -r 5bc0e9a50687
tools/python/xen/xend/server/DevController.py
--- a/tools/python/xen/xend/server/DevController.py Thu Sep 21 15:00:50
2006 +0100
+++ b/tools/python/xen/xend/server/DevController.py Thu Sep 21 15:04:29
2006 +0100
@@ -25,7 +25,7 @@ from xen.xend.xenstore.xstransact import
from xen.xend.xenstore.xstransact import xstransact, complete
from xen.xend.xenstore.xswatch import xswatch
-DEVICE_CREATE_TIMEOUT = 10
+DEVICE_CREATE_TIMEOUT = 100
HOTPLUG_STATUS_NODE = "hotplug-status"
HOTPLUG_ERROR_NODE = "hotplug-error"
HOTPLUG_STATUS_ERROR = "error"
diff -r 7c5d1c379438 -r 5bc0e9a50687 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py Thu Sep 21 15:00:50 2006 +0100
+++ b/tools/python/xen/xm/main.py Thu Sep 21 15:04:29 2006 +0100
@@ -822,11 +822,6 @@ def xm_sched_credit(args):
if weight is None and cap is None:
print server.xend.domain.sched_credit_get(domain)
else:
- if weight is None:
- weight = int(0)
- if cap is None:
- cap = int(~0)
-
err = server.xend.domain.sched_credit_set(domain, weight, cap)
if err != 0:
print err
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home