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

Store and load from qubes.xml memory, vcpus and pcidevs

Browse Source 
Needed to recreate correct xen config files (ex after template package upgrade)
This commit is contained in:
Marek Marczykowski 2011-04-02 00:37:38 +02:00
parent e22f303f79
commit 5e3b3fe922
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,6 +180,7 @@ class QubesVm(object):
template_vm = None, template_vm = None,
firewall_conf = None, firewall_conf = None,
volatile_img = None, volatile_img = None,
pcidevs = None,
vcpus = None): vcpus = None):
@ -233,7 +234,10 @@ class QubesVm(object):
self.icon_path = None self.icon_path = None
# PCI devices - used only by NetVM # PCI devices - used only by NetVM
self.pcidevs = "" if pcidevs is None or pcidevs == "none":
self.pcidevs = ""
else:
self.pcidevs = pcidevs
self.memory = memory self.memory = memory
@ -898,6 +902,7 @@ class QubesVm(object):
attrs["updateable"] = str(self.updateable) attrs["updateable"] = str(self.updateable)
attrs["label"] = self.label.name attrs["label"] = self.label.name
attrs["memory"] = str(self.memory) attrs["memory"] = str(self.memory)
attrs["pcidevs"] = str(self.pcidevs)
attrs["vcpus"] = str(self.vcpus) attrs["vcpus"] = str(self.vcpus)
return attrs return attrs
@ -1851,7 +1856,7 @@ class QubesVmCollection(dict):
common_attr_list = ("qid", "name", "dir_path", "conf_file", common_attr_list = ("qid", "name", "dir_path", "conf_file",
"private_img", "root_img", "template_qid", "private_img", "root_img", "template_qid",
"installed_by_rpm", "updateable", "installed_by_rpm", "updateable",
"uses_default_netvm", "label") "uses_default_netvm", "label", "memory", "vcpus", "pcidevs")
for attribute in common_attr_list: for attribute in common_attr_list:
kwargs[attribute] = element.get(attribute) kwargs[attribute] = element.get(attribute)