Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed init memory warning being shown twice

Browse Source 
Also fixed the init memory warning to only be shown for Linux qubes (it is
not necessary for other qubes)

fixes QubesOS/qubes-issues#5612
This commit is contained in:
Marta Marczykowska-Górecka 2020-01-30 21:43:16 +01:00
parent 22bbba5cdf
commit 0534ec6d15
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qubesmanager/settings.py
View File

@ -519,14 +519,15 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtWidgets.QDialog):
# Linux specific limit: init memory must not be below # Linux specific limit: init memory must not be below
# max_mem_size/10.79 in order to allow scaling up to # max_mem_size/10.79 in order to allow scaling up to
# max_mem_size (or else "add_memory() failed: -17" problem) # max_mem_size (or else "add_memory() failed: -17" problem)
if self.init_mem.value() * 10 < self.max_mem_size.value(): if self.vm.features.check_with_template('os', None) == 'Linux' and \
self.init_mem.value() * 10 < self.max_mem_size.value():
self.init_mem.setValue((self.max_mem_size.value() + 9) // 10)
QtWidgets.QMessageBox.warning( QtWidgets.QMessageBox.warning(
self, self,
self.tr("Warning!"), self.tr("Warning!"),
self.tr("Initial memory can not be less than one tenth " self.tr("For Linux qubes, Initial memory can not be less than "
"Max memory.<br>Setting initial memory to the minimum " "one tenth Max memory.<br>Setting initial memory "
"allowed value.")) "to the minimum allowed value."))
self.init_mem.setValue((self.max_mem_size.value() + 9) // 10)
def check_warn_dispvmnetvm(self): def check_warn_dispvmnetvm(self):
if not hasattr(self.vm, 'default_dispvm'): if not hasattr(self.vm, 'default_dispvm'):