Переглянути джерело

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

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
Marek Marczykowski-Górecki 8 роки тому
батько
коміт
3e30dc17cb
1 змінених файлів з 0 додано та 10 видалено
  1. 0 10
      qubes/vm/qubesvm.py

+ 0 - 10
qubes/vm/qubesvm.py

@@ -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