[Xen-changelog] Fix removal of use of scheduler, broken earlier today by mismerge.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID c07d5bab4c2bd29b29b9de6b9588e4be89a71aac
# Parent  340effeb64b56b231cb4c2f0d7da8f78504198ee
Fix removal of use of scheduler, broken earlier today by mismerge.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>

diff -r 340effeb64b5 -r c07d5bab4c2b tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Mon Nov 21 13:48:31 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py   Mon Nov 21 16:30:22 2005
@@ -424,7 +424,7 @@
             return []
 
 
-    def storeChanged(self):
+    def storeChanged(self, _):
         log.trace("XendDomainInfo.storeChanged");
 
         changed = False
@@ -789,7 +789,7 @@
                         log.debug(
                             "Scheduling refreshShutdown on domain %d in %ds.",
                             self.domid, timeout)
-                        scheduler.later(timeout, self.refreshShutdown)
+                        threading.Timer(timeout, self.refreshShutdown).start()
         finally:
             self.refresh_shutdown_lock.release()
 
@@ -830,7 +830,7 @@
         try:
             corefile = "/var/xen/dump/%s.%s.core" % (self.info['name'],
                                                      self.domid)
-            xc.domain_dumpcore(dom = self.domid, corefile = corefile)
+            xc.domain_dumpcore(self.domid, corefile)
 
         except:
             log.exception("XendDomainInfo.dumpCore failed: id = %s name = %s",
@@ -1106,7 +1106,7 @@
             xc.domain_setcpuweight(self.domid, self.info['cpu_weight'])
 
             m = self.image.getDomainMemory(self.info['memory'] * 1024)
-            xc.domain_setmaxmem(self.domid, maxmem_kb = m)
+            xc.domain_setmaxmem(self.domid, m)
             xc.domain_memory_increase_reservation(self.domid, m, 0, 0)
 
             cpu = self.info['cpu']
@@ -1195,7 +1195,7 @@
 
         try:
             if self.domid is not None:
-                xc.domain_destroy(dom=self.domid)
+                xc.domain_destroy(self.domid)
         except:
             log.exception("XendDomainInfo.destroy: xc.domain_destroy failed.")
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog