diff -rup xen-3.1.0-testing.hg-rc7.orig/tools/python/xen/xend/XendDomain.py xen-3.1.0-testing.hg-rc7.new/tools/python/xen/xend/XendDomain.py
--- xen-3.1.0-testing.hg-rc7.orig/tools/python/xen/xend/XendDomain.py 2007-05-17 17:38:22.000000000 -0400
+++ xen-3.1.0-testing.hg-rc7.new/tools/python/xen/xend/XendDomain.py 2007-05-17 17:43:40.000000000 -0400
@@ -994,10 +994,16 @@ class XendDomain:
dominfo.start(is_managed = True)
finally:
self.domains_lock.release()
- dominfo.waitForDevices()
+
+ try:
+ dominfo.waitForDevices()
+ except Exception, ex:
+ log.warn("Failed to setup devices for " + str(dominfo) + ": " + str(ex))
+ dominfo.destroy()
+ raise
+
if not start_paused:
dominfo.unpause()
-
def domain_delete(self, domid):
"""Remove a managed domain from database
Only in xen-3.1.0-testing.hg-rc7.new/tools/python/xen/xend: XendDomain.py~