ia64/xen-unstable

changeset 11564:5bc0e9a50687

Merge
author Tim Deegan <tim.deegan@xensource.com>
date Thu Sep 21 15:04:29 2006 +0100 (2006-09-21)
parents 7c5d1c379438 3b7c45e3bf94
children c742b2ae920c
files
line diff
     1.1 --- a/tools/examples/locking.sh	Thu Sep 21 15:00:50 2006 +0100
     1.2 +++ b/tools/examples/locking.sh	Thu Sep 21 15:04:29 2006 +0100
     1.3 @@ -21,7 +21,7 @@
     1.4  
     1.5  LOCK_SLEEPTIME=1
     1.6  LOCK_SPINNING_RETRIES=5
     1.7 -LOCK_RETRIES=10
     1.8 +LOCK_RETRIES=100
     1.9  LOCK_BASEDIR=/var/run/xen-hotplug
    1.10  
    1.11  
     2.1 --- a/tools/ioemu/target-i386-dm/helper2.c	Thu Sep 21 15:00:50 2006 +0100
     2.2 +++ b/tools/ioemu/target-i386-dm/helper2.c	Thu Sep 21 15:04:29 2006 +0100
     2.3 @@ -520,8 +520,8 @@ int main_loop(void)
     2.4              }
     2.5          }
     2.6  
     2.7 -        /* Wait up to 10 msec. */
     2.8 -        main_loop_wait(10);
     2.9 +        /* Wait up to 100 msec. */
    2.10 +        main_loop_wait(100);
    2.11  
    2.12          if (env->send_event) {
    2.13              env->send_event = 0;
     3.1 --- a/tools/python/xen/xend/XendDomain.py	Thu Sep 21 15:00:50 2006 +0100
     3.2 +++ b/tools/python/xen/xend/XendDomain.py	Thu Sep 21 15:04:29 2006 +0100
     3.3 @@ -560,13 +560,23 @@ class XendDomain:
     3.4          except Exception, ex:
     3.5              raise XendError(str(ex))
     3.6      
     3.7 -    def domain_sched_credit_set(self, domid, weight, cap):
     3.8 +    def domain_sched_credit_set(self, domid, weight = None, cap = None):
     3.9          """Set credit scheduler parameters for a domain.
    3.10          """
    3.11          dominfo = self.domain_lookup_by_name_or_id_nr(domid)
    3.12          if not dominfo:
    3.13              raise XendInvalidDomain(str(domid))
    3.14          try:
    3.15 +            if weight is None:
    3.16 +                weight = int(0)
    3.17 +            elif weight < 1 or weight > 65535:
    3.18 +                raise XendError("weight is out of range")
    3.19 +
    3.20 +            if cap is None:
    3.21 +                cap = int(~0)
    3.22 +            elif cap < 0 or cap > dominfo.getVCpuCount() * 100:
    3.23 +                raise XendError("cap is out of range")
    3.24 +
    3.25              return xc.sched_credit_domain_set(dominfo.getDomid(), weight, cap)
    3.26          except Exception, ex:
    3.27              raise XendError(str(ex))
     4.1 --- a/tools/python/xen/xend/server/DevController.py	Thu Sep 21 15:00:50 2006 +0100
     4.2 +++ b/tools/python/xen/xend/server/DevController.py	Thu Sep 21 15:04:29 2006 +0100
     4.3 @@ -25,7 +25,7 @@ from xen.xend.XendLogging import log
     4.4  from xen.xend.xenstore.xstransact import xstransact, complete
     4.5  from xen.xend.xenstore.xswatch import xswatch
     4.6  
     4.7 -DEVICE_CREATE_TIMEOUT = 10
     4.8 +DEVICE_CREATE_TIMEOUT = 100
     4.9  HOTPLUG_STATUS_NODE = "hotplug-status"
    4.10  HOTPLUG_ERROR_NODE  = "hotplug-error"
    4.11  HOTPLUG_STATUS_ERROR = "error"
     5.1 --- a/tools/python/xen/xm/main.py	Thu Sep 21 15:00:50 2006 +0100
     5.2 +++ b/tools/python/xen/xm/main.py	Thu Sep 21 15:04:29 2006 +0100
     5.3 @@ -822,11 +822,6 @@ def xm_sched_credit(args):
     5.4      if weight is None and cap is None:
     5.5          print server.xend.domain.sched_credit_get(domain)
     5.6      else:
     5.7 -        if weight is None:
     5.8 -            weight = int(0)
     5.9 -        if cap is None:
    5.10 -            cap = int(~0)
    5.11 -
    5.12          err = server.xend.domain.sched_credit_set(domain, weight, cap)
    5.13          if err != 0:
    5.14              print err