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
9 changes: 4 additions & 5 deletions qubes/vm/mix/net.py
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down