From 69b7afd242f18f97de1ec9bd37c7c3c255b2e2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 7 Jun 2025 17:27:31 +0200 Subject: [PATCH] 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. --- qubes/vm/dispvm.py | 2 +- qubes/vm/mix/net.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qubes/vm/dispvm.py b/qubes/vm/dispvm.py index 4a388e9e5..b683ed3fc 100644 --- a/qubes/vm/dispvm.py +++ b/qubes/vm/dispvm.py @@ -410,7 +410,7 @@ def on_domain_pre_unpaused( @qubes.events.handler("domain-shutdown") async def on_domain_shutdown( self, _event, **_kwargs - ): # pylint: disable=invalid-overridden-method + ): """Do auto cleanup if enabled""" await self._auto_cleanup() diff --git a/qubes/vm/mix/net.py b/qubes/vm/mix/net.py index 24702cdaf..b289b77a1 100644 --- a/qubes/vm/mix/net.py +++ b/qubes/vm/mix/net.py @@ -306,7 +306,7 @@ def on_domain_load_netvm_loop_check(self, event): self.netvm = None @qubes.events.handler("domain-shutdown") - def on_domain_shutdown(self, event, **kwargs): + def on_domain_shutdown_net(self, event, **kwargs): """Cleanup network interfaces of connected, running VMs. This will allow re-reconnecting them cleanly later.