Kill paused qubes on system shutdown

fixes: QubesOS/qubes-issues#8580
QubesOS · Sep 3, 2024 · 2ff9968 · 2ff9968
1 parent 68070df
commit 2ff9968
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py
@@ -1385,7 +1385,13 @@ async def shutdown(self, force=False, wait=False, timeout=None):
             if self.__waiter is None:
                 self.__waiter = asyncio.get_running_loop().create_future()
             waiter = self.__waiter
-            self.libvirt_domain.shutdown()
+
+            if self.is_paused() and not force:
+                raise qubes.exc.QubesVMNotRunningError(self)
+            elif self.is_paused():
+                self.libvirt_domain.destroy()
+            else:
+                self.libvirt_domain.shutdown()
 
             if wait:
                 if timeout is None: