bitkeeper revision 1.1617 (429c8920BjgVBzWyVe6fs4GTiKD5Yw)

XendDomainInfo.py, XendDomain.py:
  tmp_restore_create_domain is vm_restore now.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

tools/python/xen/xend/XendDomain.py

@@ -312,8 +312,7 @@ class XendDomain:
         @param vmconfig: vm configuration
         """
         config = sxp.child_value(vmconfig, 'config')
-        dominfo = XendDomainInfo.tmp_restore_create_domain()
-        dominfo.dom_construct(dominfo.dom, config)
+        dominfo = XendDomainInfo.vm_restore(config)
         self._add_domain(dominfo)
         return dominfo
     

tools/python/xen/xend/XendDomainInfo.py

@@ -153,11 +153,14 @@ def vm_create(config):
     vm.construct(config)
     return vm
 
-def tmp_restore_create_domain():
-    # dom input parameter is ignored
+def vm_restore(config):
+    """Create a domain and a VM object to do a restore.
+
+    @param config:    domain configuration
+    """
     vm = XendDomainInfo()
     dom = xc.domain_create()
-    vm.setdom(dom)
+    vm.dom_construct(dom, config)
     return vm
 
 def vm_recreate(savedinfo, info):