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

Minor changes to make VMM connection really lazy

Browse Source 
1. Fake dom0 object doesn't need proper maxmem nor vcpus - set
statically to 0 instead of getting from physical host.
2. QubesHVM doesn't preserve maxmem setting, so set it to self.memory
earlier (to suppress default total_memory/2 calculation).
This commit is contained in:
Marek Marczykowski 2013-05-18 03:51:30 +02:00 committed by Marek Marczykowski-Górecki
parent b8c62c0279
commit 8e9c59e7f8
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core-modules/006QubesAdminVm.py
View File

@ -37,6 +37,8 @@ class QubesAdminVm(QubesNetVm):
dir_path=None, dir_path=None,
private_img = None, private_img = None,
template = None, template = None,
maxmem = 0,
vcpus = 0,
label = defaults["template_label"], label = defaults["template_label"],
**kwargs) **kwargs)

10
core-modules/01QubesHVm.py
View File

@ -63,7 +63,9 @@ class QubesHVm(QubesVm):
lambda x: system_path["config_template_hvm"] lambda x: system_path["config_template_hvm"]
attrs['drive'] = { 'attr': '_drive', attrs['drive'] = { 'attr': '_drive',
'save': lambda: str(self.drive) } 'save': lambda: str(self.drive) }
# Remove this two lines when HVM will get qmemman support
attrs['maxmem'].pop('save') attrs['maxmem'].pop('save')
attrs['maxmem']['func'] = lambda x: self.memory
attrs['timezone'] = { 'default': 'localtime', attrs['timezone'] = { 'default': 'localtime',
'save': lambda: str(self.timezone) } 'save': lambda: str(self.timezone) }
attrs['qrexec_installed'] = { 'default': False, attrs['qrexec_installed'] = { 'default': False,
@ -93,11 +95,9 @@ class QubesHVm(QubesVm):
(not 'xml_element' in kwargs or kwargs['xml_element'].get('guiagent_installed') is None): (not 'xml_element' in kwargs or kwargs['xml_element'].get('guiagent_installed') is None):
self.services['meminfo-writer'] = False self.services['meminfo-writer'] = False
# HVM normally doesn't support dynamic memory management # Disable qemu GUID if the user installed qubes gui agent
if not ('meminfo-writer' in self.services and self.services['meminfo-writer']): if self.guiagent_installed:
self.maxmem = self.memory self._start_guid_first = False
self._stubdom_guid_process = None
@property @property
def type(self): def type(self):