From 0d54d63629e75fbb70fa224c353055489e3e69e4 Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Mon, 26 Jan 2026 18:00:19 +0100 Subject: [PATCH] Fix deferred netvm detachment Fixes: https://github.com/QubesOS/qubes-issues/issues/10619 For: https://github.com/QubesOS/qubes-issues/issues/1512 --- qubes/vm/mix/net.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/qubes/vm/mix/net.py b/qubes/vm/mix/net.py index 7625341f4..4b8d5117c 100644 --- a/qubes/vm/mix/net.py +++ b/qubes/vm/mix/net.py @@ -455,11 +455,10 @@ def detach_network(self): if not self.is_running(): raise qubes.exc.QubesVMNotRunningError(self) deferred_from = self.features.get("deferred-netvm-original", None) - if self.netvm is None: - if deferred_from is not None: - raise qubes.exc.QubesVMError( - self, "netvm should not be {}".format(self.netvm) - ) + if self.netvm is None and deferred_from is None: + raise qubes.exc.QubesVMError( + self, "netvm should not be {}".format(self.netvm) + ) # Properties extracted from libvirt_domain to support deferred netvm. root = lxml.etree.fromstring(self.libvirt_domain.XMLDesc())