Skip to content

Commit 1b0f0ee

Browse files
committed
Fix dom0 feature gathering
1 parent e518b03 commit 1b0f0ee

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

qubes_config/global_config/basics_handler.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,10 @@ def __init__(
222222
self.qapp = qapp
223223
self.widget = widget
224224
self.dependent_widget = dependent_widget
225-
# TODO: ben: if changing default_dispvm, set old value to 0 first,
226-
# this should be done in core-admin.
227-
# TODO: ben: use dom0 feature 'preload-dispvm-max'
225+
# TODO: ben: if changing default_dispvm, call the
226+
# 'preload-dispvm-start' event for the old qube to update according
227+
# to the disposable template 'preload-dispvm-max' feature. This
228+
# should be done in core-admin.
228229
self.is_dvm_template = is_dvm_template
229230
self.preload_dispvm_adjustment = Gtk.Adjustment()
230231
self.preload_dispvm_adjustment.configure(0, 0, 50, 1, 10, 0)
@@ -265,9 +266,9 @@ def save(self):
265266
"""Save changes: update system value and mark it as new initial value"""
266267
if not self.is_changed():
267268
return
268-
if not (qube := self.get_dependent_value()):
269+
if not self.get_dependent_value():
269270
return
270-
self.qapp.domains[qube].features["preload-dispvm-max"] = int(
271+
self.qapp.domains["dom0"].features["preload-dispvm-max"] = int(
271272
self.widget.get_value()
272273
)
273274

@@ -294,11 +295,11 @@ def get_unsaved(self):
294295

295296
def get_current_value(self):
296297
"""This should never be called."""
297-
if not (qube := self.get_dependent_value()):
298+
if not self.get_dependent_value():
298299
return 0
299-
if self.is_dvm_template:
300+
if not self.is_dvm_template:
300301
return 0
301-
return int(self.qapp.domains[qube].features.get("preload-dispvm-max", 0) or 0)
302+
return int(self.qapp.domains["dom0"].features.get("preload-dispvm-max")) or 0
302303

303304
def update_current_value(self):
304305
"""This should never be called."""

qubes_config/tests/test_basics_handler.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,4 +364,7 @@ def test_basics_handler(real_builder, test_qapp):
364364
test_qapp.expected_calls[
365365
("dom0", "admin.property.Set", "clockvm", b"test-blue")
366366
] = b"0\x00"
367+
test_qapp.expected_calls[
368+
("dom0", "admin.vm.feature.Get", "preload-dispvm-max", None)
369+
] = b"0\x00"
367370
basics_handler.save()

0 commit comments

Comments
 (0)