|
@@ -256,7 +256,7 @@ class BaseVM(qubes.PropertyHolder):
|
|
|
element.set('id', 'domain-' + str(self.qid))
|
|
|
element.set('class', self.__class__.__name__)
|
|
|
|
|
|
- element.append(self.save_properties())
|
|
|
+ element.append(self.xml_properties())
|
|
|
|
|
|
services = lxml.etree.Element('services')
|
|
|
for service in self.services:
|
|
@@ -303,7 +303,7 @@ class BaseVM(qubes.PropertyHolder):
|
|
|
#
|
|
|
|
|
|
@staticmethod
|
|
|
- def xml_net_dev(ip, mac, backend):
|
|
|
+ def lvxml_net_dev(ip, mac, backend):
|
|
|
'''Return ``<interface>`` node for libvirt xml.
|
|
|
|
|
|
This was previously _format_net_dev
|
|
@@ -323,7 +323,7 @@ class BaseVM(qubes.PropertyHolder):
|
|
|
|
|
|
|
|
|
@staticmethod
|
|
|
- def xml_pci_dev(address):
|
|
|
+ def lvxml_pci_dev(address):
|
|
|
'''Return ``<hostdev>`` node for libvirt xml.
|
|
|
|
|
|
This was previously _format_pci_dev
|
|
@@ -365,7 +365,7 @@ class BaseVM(qubes.PropertyHolder):
|
|
|
args['uuidnode'] = '<uuid>{!r}</uuid>'.format(self.uuid) \
|
|
|
if hasattr(self, 'uuid') else ''
|
|
|
args['vmdir'] = self.dir_path
|
|
|
- args['pcidevs'] = ''.join(lxml.etree.tostring(self.xml_pci_dev(dev))
|
|
|
+ args['pcidevs'] = ''.join(lxml.etree.tostring(self.lvxml_pci_dev(dev))
|
|
|
for dev in self.devices['pci'])
|
|
|
args['maxmem'] = str(self.maxmem)
|
|
|
args['vcpus'] = str(self.vcpus)
|
|
@@ -382,7 +382,7 @@ class BaseVM(qubes.PropertyHolder):
|
|
|
args['dns1'] = self.netvm.gateway
|
|
|
args['dns2'] = self.secondary_dns
|
|
|
args['netmask'] = self.netmask
|
|
|
- args['netdev'] = lxml.etree.tostring(self.xml_net_dev(self.ip, self.mac, self.netvm))
|
|
|
+ args['netdev'] = lxml.etree.tostring(self.lvxml_net_dev(self.ip, self.mac, self.netvm))
|
|
|
args['disable_network1'] = '';
|
|
|
args['disable_network2'] = '';
|
|
|
else:
|