diff options
| author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-31 15:56:16 +0000 |
|---|---|---|
| committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-31 15:56:16 +0000 |
| commit | 433792cb4c74dd6596134bf1187f810a3815a562 (patch) | |
| tree | 42a85078ec960fd5ea846f976ebfbd5d1a49dc32 /tools | |
| parent | b56c43921e28018dd9fab1e2bbb0ffa3c02c8334 (diff) | |
| download | xen-433792cb4c74dd6596134bf1187f810a3815a562.tar.gz xen-433792cb4c74dd6596134bf1187f810a3815a562.tar.bz2 xen-433792cb4c74dd6596134bf1187f810a3815a562.zip | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/python/xen/xend/XendDomain.py | 3 | ||||
| -rw-r--r-- | tools/python/xen/xend/XendDomainInfo.py | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index 94c299c791..5c504897aa 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/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 diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index ddb9bcf832..0dc1aae79c 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/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): |