From 45d6ab38621ad08da1a97915e086411a2a346b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 3 Apr 2016 03:46:28 +0200 Subject: [PATCH] qubes/vm: store libvirt config in libvirt.xml, fix rename handling --- qubes/vm/qubesvm.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py index 804988bb..52e44c43 100644 --- a/qubes/vm/qubesvm.py +++ b/qubes/vm/qubesvm.py @@ -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: