Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions qubes/vm/mix/dvmtemplate.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,23 +86,26 @@ def on_domain_loaded(self, event) -> None:
# qube instead of "is_preload()" because it might not be in the
# "preload-dispvm" list anymore if the following happened: "removed
# from list -> scheduled cleanup -> stopped qubesd".
preload_in_progress = [
qube
for qube in self.dispvms
if (
not qube.is_running()
and qube.features.get("preload-dispvm-completed", False)
)
or qube.features.get("preload-dispvm-in-progress", False)
]
if preload_in_progress:
changes = True
self.remove_preload_from_list(
[qube.name for qube in preload_in_progress],
reason="their progress was interrupted",
)
for dispvm in preload_in_progress:
asyncio.ensure_future(dispvm.cleanup(force=True))
if not self.app.vmm.offline_mode:
# Can't check if qube is running if in offline_mode, set by
# qubes.backup. Better to not attempt to manipulate qube.
preload_in_progress = [
qube
for qube in self.dispvms
if (
not qube.is_running()
and qube.features.get("preload-dispvm-completed", False)
)
or qube.features.get("preload-dispvm-in-progress", False)
]
if preload_in_progress:
changes = True
self.remove_preload_from_list(
[qube.name for qube in preload_in_progress],
reason="their progress was interrupted",
)
for dispvm in preload_in_progress:
asyncio.ensure_future(dispvm.cleanup(force=True))

if changes:
self.app.save()
Expand Down