direct-io.hg

changeset 7949:c07d5bab4c2b

Fix removal of use of scheduler, broken earlier today by mismerge.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author emellor@leeni.uk.xensource.com
date Mon Nov 21 17:30:22 2005 +0100 (2005-11-21)
parents 340effeb64b5
children e336e186e5f9
files tools/python/xen/xend/XendDomainInfo.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Mon Nov 21 14:48:31 2005 +0100
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Mon Nov 21 17:30:22 2005 +0100
     1.3 @@ -424,7 +424,7 @@ class XendDomainInfo:
     1.4              return []
     1.5  
     1.6  
     1.7 -    def storeChanged(self):
     1.8 +    def storeChanged(self, _):
     1.9          log.trace("XendDomainInfo.storeChanged");
    1.10  
    1.11          changed = False
    1.12 @@ -789,7 +789,7 @@ class XendDomainInfo:
    1.13                          log.debug(
    1.14                              "Scheduling refreshShutdown on domain %d in %ds.",
    1.15                              self.domid, timeout)
    1.16 -                        scheduler.later(timeout, self.refreshShutdown)
    1.17 +                        threading.Timer(timeout, self.refreshShutdown).start()
    1.18          finally:
    1.19              self.refresh_shutdown_lock.release()
    1.20  
    1.21 @@ -830,7 +830,7 @@ class XendDomainInfo:
    1.22          try:
    1.23              corefile = "/var/xen/dump/%s.%s.core" % (self.info['name'],
    1.24                                                       self.domid)
    1.25 -            xc.domain_dumpcore(dom = self.domid, corefile = corefile)
    1.26 +            xc.domain_dumpcore(self.domid, corefile)
    1.27  
    1.28          except:
    1.29              log.exception("XendDomainInfo.dumpCore failed: id = %s name = %s",
    1.30 @@ -1106,7 +1106,7 @@ class XendDomainInfo:
    1.31              xc.domain_setcpuweight(self.domid, self.info['cpu_weight'])
    1.32  
    1.33              m = self.image.getDomainMemory(self.info['memory'] * 1024)
    1.34 -            xc.domain_setmaxmem(self.domid, maxmem_kb = m)
    1.35 +            xc.domain_setmaxmem(self.domid, m)
    1.36              xc.domain_memory_increase_reservation(self.domid, m, 0, 0)
    1.37  
    1.38              cpu = self.info['cpu']
    1.39 @@ -1195,7 +1195,7 @@ class XendDomainInfo:
    1.40  
    1.41          try:
    1.42              if self.domid is not None:
    1.43 -                xc.domain_destroy(dom=self.domid)
    1.44 +                xc.domain_destroy(self.domid)
    1.45          except:
    1.46              log.exception("XendDomainInfo.destroy: xc.domain_destroy failed.")
    1.47