mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
Remove dependency between domain db and path/uuid.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
This commit is contained in:
1 parent
9763103317
commit
64f36ac6d0
1 file changed
+9
-5
@@ -156,7 +156,8 @@ class XendDomainInfo:
|
||||
"""
|
||||
uuid = getUuid()
|
||||
db = parentdb.addChild(uuid)
|
||||
vm = cls(db)
|
||||
path = parentdb.getPath()
|
||||
vm = cls(uuid, path, db)
|
||||
vm.construct(config)
|
||||
vm.saveToDB(sync=True)
|
||||
|
||||
@@ -171,7 +172,8 @@ class XendDomainInfo:
|
||||
@param info: domain info from xc
|
||||
"""
|
||||
dom = info['dom']
|
||||
vm = cls(db)
|
||||
path = "/".join(db.getPath().split("/")[0:-1])
|
||||
vm = cls(db.getName(), path, db)
|
||||
vm.setdom(dom)
|
||||
db.readDB()
|
||||
vm.importFromDB()
|
||||
@@ -206,7 +208,8 @@ class XendDomainInfo:
|
||||
if not uuid:
|
||||
uuid = getUuid()
|
||||
db = parentdb.addChild(uuid)
|
||||
vm = cls(db)
|
||||
path = parentdb.getPath()
|
||||
vm = cls(uuid, path, db)
|
||||
ssidref = int(sxp.child_value(config, 'ssidref'))
|
||||
log.debug('restoring with ssidref='+str(ssidref))
|
||||
id = xc.domain_create(ssidref = ssidref)
|
||||
@@ -239,9 +242,10 @@ class XendDomainInfo:
|
||||
DBVar('device_model_pid', ty='int'),
|
||||
]
|
||||
|
||||
def __init__(self, db):
|
||||
def __init__(self, uuid, path, db):
|
||||
self.uuid = uuid
|
||||
self.path = path + "/" + uuid
|
||||
self.db = db
|
||||
self.uuid = db.getName()
|
||||
|
||||
self.recreate = 0
|
||||
self.restore = 0
|
||||
|
||||