Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arameters for add_new_*, variables loaded from qubes.xml

Browse Source 
Cow based VMs doesn't have root_img param, but private_img.
This commit is contained in:
Marek Marczykowski 2011-03-11 01:59:56 +01:00
parent 8928e55215
commit a3d8778841
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dom0/qvm-core/qubes.py
View File

@ -1573,14 +1573,14 @@ class QubesVmCollection(dict):
def add_new_netvm(self, name, template_vm, def add_new_netvm(self, name, template_vm,
dir_path = None, conf_file = None, dir_path = None, conf_file = None,
root_img = None): private_img = None):
qid = self.get_new_unused_qid() qid = self.get_new_unused_qid()
netid = self.get_new_unused_netid() netid = self.get_new_unused_netid()
vm = QubesNetVm (qid=qid, name=name, template_vm=template_vm, vm = QubesNetVm (qid=qid, name=name, template_vm=template_vm,
netid=netid, netid=netid,
dir_path=dir_path, conf_file=conf_file, private_img=private_img,
root_img=root_img) dir_path=dir_path, conf_file=conf_file)
if not self.verify_new_vm (vm): if not self.verify_new_vm (vm):
assert False, "Wrong VM description!" assert False, "Wrong VM description!"
@ -1593,15 +1593,15 @@ class QubesVmCollection(dict):
def add_new_proxyvm(self, name, template_vm, def add_new_proxyvm(self, name, template_vm,
dir_path = None, conf_file = None, dir_path = None, conf_file = None,
root_img = None): private_img = None):
qid = self.get_new_unused_qid() qid = self.get_new_unused_qid()
netid = self.get_new_unused_netid() netid = self.get_new_unused_netid()
vm = QubesProxyVm (qid=qid, name=name, template_vm=template_vm, vm = QubesProxyVm (qid=qid, name=name, template_vm=template_vm,
netid=netid, netid=netid,
private_img=private_img,
dir_path=dir_path, conf_file=conf_file, dir_path=dir_path, conf_file=conf_file,
netvm_vm = self.get_default_fw_netvm_vm(), netvm_vm = self.get_default_fw_netvm_vm())
root_img=root_img)
if not self.verify_new_vm (vm): if not self.verify_new_vm (vm):
assert False, "Wrong VM description!" assert False, "Wrong VM description!"
@ -1827,7 +1827,7 @@ class QubesVmCollection(dict):
try: try:
kwargs = {} kwargs = {}
attr_list = ("qid", "netid", "name", "dir_path", "conf_file", attr_list = ("qid", "netid", "name", "dir_path", "conf_file",
"private_img", "root_img", "template_qid", "private_img", "template_qid", "updateable",
) )
for attribute in attr_list: for attribute in attr_list:
@ -1859,8 +1859,8 @@ class QubesVmCollection(dict):
for element in tree.findall("QubesProxyVm"): for element in tree.findall("QubesProxyVm"):
try: try:
kwargs = {} kwargs = {}
attr_list = ("qid", "netid", "name", "dir_path", "conf_file", attr_list = ("qid", "netid", "name", "dir_path", "conf_file", "updateable",
"private_img", "root_img", "netvm_qid", "template_qid") "private_img", "template_qid")
for attribute in attr_list: for attribute in attr_list:
kwargs[attribute] = element.get(attribute) kwargs[attribute] = element.get(attribute)