ChangeSet 1.1327.2.7, 2005/04/22 18:07:05+01:00, mjw@xxxxxxxxxxxxxxxxxxx
Remove deferred and dead code.
Signed-off-by: Mike Wray <mike.wray@xxxxxx>
EventServer.py | 2 +-
XendMigrate.py | 11 -----------
2 files changed, 1 insertion(+), 12 deletions(-)
diff -Nru a/tools/python/xen/xend/EventServer.py
b/tools/python/xen/xend/EventServer.py
--- a/tools/python/xen/xend/EventServer.py 2005-05-13 16:04:09 -04:00
+++ b/tools/python/xen/xend/EventServer.py 2005-05-13 16:04:09 -04:00
@@ -132,7 +132,7 @@
if async:
reactor.callLater(0, self.call_handlers, event, val)
else:
- self.notify_handlers(event, val)
+ self.call_handlers(event, val)
def call_handlers(self, event, val):
"""Internal method to call event handlers.
diff -Nru a/tools/python/xen/xend/XendMigrate.py
b/tools/python/xen/xend/XendMigrate.py
--- a/tools/python/xen/xend/XendMigrate.py 2005-05-13 16:04:09 -04:00
+++ b/tools/python/xen/xend/XendMigrate.py 2005-05-13 16:04:09 -04:00
@@ -197,8 +197,6 @@
"""Add an error to the error list.
Returns the error added.
"""
- #while isinstance(err, Failure):
- # err = err.value
if err not in self.errors:
self.errors.append(err)
return err
@@ -386,8 +384,6 @@
self.state = 'ok'
self.dst_dom = dom
self.xd.domain_destroy(self.src_dom)
- #if not self.deferred.called:
- # self.deferred.callback(self)
def connectionLost(self, reason=None):
print 'XendMigrateInfo>connectionLost>', reason
@@ -437,8 +433,6 @@
def xfr_save_ok(self, xfrd, val):
self.state = 'ok'
self.xd.domain_destroy(self.src_dom)
- #if not self.deferred.called:
- # self.deferred.callback(self)
def connectionLost(self, reason=None):
print 'XendSaveInfo>connectionLost>', reason
@@ -479,8 +473,6 @@
dom = int(sxp.child0(val))
dominfo = self.xd.domain_get(dom)
self.state = 'ok'
- if not self.deferred.called:
- self.deferred.callback(dominfo)
def connectionLost(self, reason=None):
XfrdInfo.connectionLost(self, reason)
@@ -548,7 +540,6 @@
Remove the session from the table when it finishes.
@param info: session
- @return: deferred
"""
self._add_session(info)
try:
@@ -563,7 +554,6 @@
@param dominfo: domain info
@param host: destination host
@param port: destination port
- @return: deferred
"""
xid = self.nextid()
info = XendMigrateInfo(xid, dominfo, host, port, live, resource)
@@ -574,7 +564,6 @@
@param dominfo: domain info
@param file: destination file
- @return: deferred
"""
xid = self.nextid()
info = XendSaveInfo(xid, dominfo, file)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home