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

qubes/vm: remove special case for 'meminfo-writer' feature

Browse Source 
It should be either in a plugin, or handled entirely from inside of VM.
But surely not in main QubesVM class.

Fixes QubesOS/qubes-issues#2101
This commit is contained in:
Marek Marczykowski-Górecki 2016-06-26 02:28:18 +02:00
parent 0293c1c7ef
commit 3e30dc17cb
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qubes/vm/qubesvm.py
View File

@ -445,8 +445,6 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
'volume_config specified, but {} did not expect that.'.format(
self.__class__.__name__))
import qubes.vm.adminvm # pylint: disable=redefined-outer-name
# Init private attrs
self._libvirt_domain = None
@ -465,14 +463,6 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
# if not hasattr(self, 'vcpus') and not self.app.vmm.offline_mode:
# self.vcpus = self.app.host.no_cpus
if len(self.devices['pci']) > 0:
# Force meminfo-writer disabled when VM have PCI devices
self.features['meminfo-writer'] = None
elif not isinstance(self, qubes.vm.adminvm.AdminVM) \
and 'meminfo-writer' not in self.features:
# Always set if meminfo-writer should be active or not
self.features['meminfo-writer'] = '1'
if xml is None:
# new qube, disable updates check if requested for new qubes
# SEE: 1637 when features are done, migrate to plugin