qubes/vm: store libvirt config in libvirt.xml, fix rename handling

This commit is contained in:
Marek Marczykowski-Górecki 2016-04-03 03:46:28 +02:00 committed by Wojtek Porczyk
parent 12df07edd0
commit 45d6ab3862

View File

@ -390,7 +390,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
@property
def conf_file(self):
return os.path.join(self.dir_path, self.name + '.conf')
return os.path.join(self.dir_path, 'libvirt.xml')
# XXX I don't know what to do with these; probably should be isinstance(...)
@ -541,10 +541,6 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
os.path.join(qubes.config.system_path['qubes_base_dir'],
self.dir_path_prefix, old_name))
self.storage.rename(
os.path.join(self.dir_path, new_name + '.conf'),
os.path.join(self.dir_path, old_name + '.conf'))
self._update_libvirt_domain()
if self.autostart: