ia64/xen-unstable

changeset 4643:e81b04e1c86a

bitkeeper revision 1.1327.2.7 (42692f39Ootfn2QyViUck00eh0wT7Q)

Remove deferred and dead code.
Signed-off-by: Mike Wray <mike.wray@hp.com>
author mjw@wray-m-3.hpl.hp.com
date Fri Apr 22 17:07:05 2005 +0000 (2005-04-22)
parents b720e2fb6b00
children bd15906125a7
files tools/python/xen/xend/EventServer.py tools/python/xen/xend/XendMigrate.py
line diff
     1.1 --- a/tools/python/xen/xend/EventServer.py	Fri Apr 22 16:34:06 2005 +0000
     1.2 +++ b/tools/python/xen/xend/EventServer.py	Fri Apr 22 17:07:05 2005 +0000
     1.3 @@ -132,7 +132,7 @@ class EventServer:
     1.4          if async:
     1.5              reactor.callLater(0, self.call_handlers, event, val)
     1.6          else:
     1.7 -            self.notify_handlers(event, val)
     1.8 +            self.call_handlers(event, val)
     1.9  
    1.10      def call_handlers(self, event, val):
    1.11          """Internal method to call event handlers.
     2.1 --- a/tools/python/xen/xend/XendMigrate.py	Fri Apr 22 16:34:06 2005 +0000
     2.2 +++ b/tools/python/xen/xend/XendMigrate.py	Fri Apr 22 17:07:05 2005 +0000
     2.3 @@ -197,8 +197,6 @@ class XfrdInfo:
     2.4          """Add an error to the error list.
     2.5          Returns the error added.
     2.6          """
     2.7 -        #while isinstance(err, Failure):
     2.8 -        #    err = err.value
     2.9          if err not in self.errors:
    2.10              self.errors.append(err)
    2.11          return err
    2.12 @@ -386,8 +384,6 @@ class XendMigrateInfo(XfrdInfo):
    2.13          self.state = 'ok'
    2.14          self.dst_dom = dom
    2.15          self.xd.domain_destroy(self.src_dom)
    2.16 -        #if not self.deferred.called:
    2.17 -        #    self.deferred.callback(self)
    2.18  
    2.19      def connectionLost(self, reason=None):
    2.20          print 'XendMigrateInfo>connectionLost>', reason
    2.21 @@ -437,8 +433,6 @@ class XendSaveInfo(XfrdInfo):
    2.22      def xfr_save_ok(self, xfrd, val):
    2.23          self.state = 'ok'
    2.24          self.xd.domain_destroy(self.src_dom)
    2.25 -        #if not self.deferred.called:
    2.26 -        #    self.deferred.callback(self)
    2.27  
    2.28      def connectionLost(self, reason=None):
    2.29          print 'XendSaveInfo>connectionLost>', reason
    2.30 @@ -479,8 +473,6 @@ class XendRestoreInfo(XfrdInfo):
    2.31          dom = int(sxp.child0(val))
    2.32          dominfo = self.xd.domain_get(dom)
    2.33          self.state = 'ok'
    2.34 -        if not self.deferred.called:
    2.35 -            self.deferred.callback(dominfo)
    2.36           
    2.37      def connectionLost(self, reason=None):
    2.38          XfrdInfo.connectionLost(self, reason)
    2.39 @@ -548,7 +540,6 @@ class XendMigrate:
    2.40          Remove the session from the table when it finishes.
    2.41  
    2.42          @param info: session
    2.43 -        @return: deferred
    2.44          """
    2.45          self._add_session(info)
    2.46          try:
    2.47 @@ -563,7 +554,6 @@ class XendMigrate:
    2.48          @param dominfo:  domain info
    2.49          @param host: destination host
    2.50          @param port: destination port
    2.51 -        @return: deferred
    2.52          """
    2.53          xid = self.nextid()
    2.54          info = XendMigrateInfo(xid, dominfo, host, port, live, resource)
    2.55 @@ -574,7 +564,6 @@ class XendMigrate:
    2.56  
    2.57          @param dominfo:  domain info
    2.58          @param file: destination file
    2.59 -        @return: deferred
    2.60          """
    2.61          xid = self.nextid()
    2.62          info = XendSaveInfo(xid, dominfo, file)