[Xen-changelog] merge

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

# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxxx
# Node ID 18f04796ea89798c85e843912856994bfa2f9d65
# Parent  451669097ffd4e7e57f5d53b8be6c0c324245743
# Parent  6b6588e66b96e5d39359249dcadfad3ae1829346
merge

diff -r 451669097ffd -r 18f04796ea89 tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py       Wed Aug 17 12:29:34 2005
+++ b/tools/python/xen/xend/XendDomain.py       Wed Aug 17 12:30:04 2005
@@ -320,8 +320,7 @@
         @param vmconfig: vm configuration
         """
         config = sxp.child_value(vmconfig, 'config')
-        uuid = sxp.child_value(vmconfig, 'uuid')
-        dominfo = XendDomainInfo.restore(self.dbmap, config, uuid=uuid)
+        dominfo = XendDomainInfo.restore(self.dbmap, config)
         return dominfo
 
     def domain_restore(self, src, progress=False):
diff -r 451669097ffd -r 18f04796ea89 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Wed Aug 17 12:29:34 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py   Wed Aug 17 12:30:04 2005
@@ -195,13 +195,15 @@
 
     recreate = classmethod(recreate)
 
-    def restore(cls, parentdb, config, uuid):
+    def restore(cls, parentdb, config, uuid=None):
         """Create a domain and a VM object to do a restore.
 
         @param parentdb:  parent db
         @param config:    domain configuration
         @param uuid:      uuid to use
         """
+        if not uuid:
+            uuid = getUuid()
         db = parentdb.addChild(uuid)
         vm = cls(db)
         ssidref = int(sxp.child_value(config, 'ssidref'))

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