Skip to content

Commit 69b7afd

Browse files
committed
Rename on_domain_shutdown to avoid DispVM clobbering the function
DispVM.on_domain_shutdown clobbers NetVMMixin.on_domain_shutdown. Rename the latter to avoid that.
1 parent 0be3631 commit 69b7afd

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

qubes/vm/dispvm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ def on_domain_pre_unpaused(
410410
@qubes.events.handler("domain-shutdown")
411411
async def on_domain_shutdown(
412412
self, _event, **_kwargs
413-
): # pylint: disable=invalid-overridden-method
413+
):
414414
"""Do auto cleanup if enabled"""
415415
await self._auto_cleanup()
416416

qubes/vm/mix/net.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ def on_domain_load_netvm_loop_check(self, event):
306306
self.netvm = None
307307

308308
@qubes.events.handler("domain-shutdown")
309-
def on_domain_shutdown(self, event, **kwargs):
309+
def on_domain_shutdown_net(self, event, **kwargs):
310310
"""Cleanup network interfaces of connected, running VMs.
311311
312312
This will allow re-reconnecting them cleanly later.

0 commit comments

Comments
 (0)