# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 383f1336c30590eaef6f24881693aaf27ce75a4a
# Parent cc1572db6a3d57c36f40b9530c2d2f02786429ba
Move uuid back into main domain dir.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>
diff -r cc1572db6a3d -r 383f1336c305 tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py Wed Sep 14 12:49:13 2005
+++ b/tools/python/xen/xend/XendDomain.py Wed Sep 14 13:37:03 2005
@@ -142,7 +142,7 @@
domdb.delete()
elif domid in doms:
try:
- self._new_domain(db.uuid, db, doms[domid])
+ self._new_domain(domdb["uuid"].getData(), db, doms[domid])
except Exception, ex:
log.exception("Error recreating domain info: id=%d", domid)
self._delete_domain(domid)
diff -r cc1572db6a3d -r 383f1336c305 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py Wed Sep 14 12:49:13 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py Wed Sep 14 13:37:03 2005
@@ -205,7 +205,6 @@
__exports__ = [
DBVar('id', ty='int'),
DBVar('name', ty='str'),
- DBVar('uuid', ty='str'),
DBVar('config', ty='sxpr'),
DBVar('start_time', ty='float'),
DBVar('state', ty='str'),
@@ -219,6 +218,7 @@
def __init__(self, uuid, path, db):
self.uuid = uuid
self.path = path + "/" + uuid
+
self.db = db
self.recreate = 0
@@ -263,6 +263,8 @@
self.vcpus = 1
self.bootloader = None
self.device_model_pid = 0
+
+ xstransact.Write(self.path, "uuid", self.uuid)
def setDB(self, db):
self.db = db
diff -r cc1572db6a3d -r 383f1336c305 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Wed Sep 14 12:49:13 2005
+++ b/tools/python/xen/xend/image.py Wed Sep 14 13:37:03 2005
@@ -155,7 +155,6 @@
if dom <= 0:
raise VmError('Creating domain failed: name=%s' % self.vm.name)
log.debug("initDomain: cpu=%d mem_kb=%d ssidref=%d dom=%d", cpu,
mem_kb, ssidref, dom)
- # xc.domain_setuuid(dom, uuid)
xc.domain_setcpuweight(dom, cpu_weight)
xc.domain_setmaxmem(dom, mem_kb)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home