Don't block main thread on qube hanging shutdown

The merge request to core-admin already avoids the main problem, of a hanging
shutdown blocking qubesd. This change avoids a hanging shutdown blocking the
interaction with the qube manager

For: QubesOS/qubes-issues#10648
Fixes: QubesOS/qubes-issues#10074
Requires: QubesOS/qubes-core-admin#807
Requires: QubesOS/qubes-core-admin-client#469

Author: ben-grande

debian/control

@@ -22,7 +22,7 @@ X-Python3-Version: >= 3.4
 Package: qubes-manager
 Architecture: any
 Depends:
-  python3-qubesadmin (>= 4.3.13),
+  python3-qubesadmin (>= 4.3.33),
   python3-qubesimgconverter,
   python3-pyqt6,
   python3-pyinotify,

qubesmanager/qube_manager.py

@@ -696,6 +696,20 @@ def run(self):
             self.msg = ("Error starting Qube!", str(ex))
 
 
+# pylint: disable=too-few-public-methods
+class ShutdownVMThread(common_threads.QubesThread):
+    def __init__(self, vm, force: bool = False, wait: bool = False):
+        super().__init__(vm)
+        self.force = force
+        self.wait_end = wait  # wait() is callable, let's not interfere.
+
+    def run(self):
+        try:
+            self.vm.shutdown(force=self.force, wait=self.wait_end)
+        except exc.QubesException as ex:
+            self.msg = ("Error starting Qube!", str(ex))
+
+
 # pylint: disable=too-few-public-methods
 class UpdateVMsThread(common_threads.QubesThread):
     def run(self):
@@ -1660,9 +1674,15 @@ def shutdown_vm(self, vm, force=False, check_time=vm_restart_check_timeout,
 
                 force = True
                 for connected_vm in connected_vms:
-                    connected_vm.shutdown(force=force)
+                    thread = ShutdownVMThread(connected_vm, force=force)
+                    self.threads_list.append(thread)
+                    thread.finished.connect(self.clear_threads)
+                    thread.start()
 
-            vm.shutdown(force=force)
+            thread = ShutdownVMThread(vm, force=force, wait=True)
+            self.threads_list.append(thread)
+            thread.finished.connect(self.clear_threads)
+            thread.start()
         except exc.QubesException as ex:
             QMessageBox.warning(
                 self,

rpm_spec/qmgr.spec.in

@@ -10,7 +10,7 @@ URL:		https://www.qubes-os.org
 Requires:	python%{python3_pkgversion}
 Requires:	python%{python3_pkgversion}-pyqt6
 Requires:	python%{python3_pkgversion}-inotify
-Requires:	python%{python3_pkgversion}-qubesadmin >= 4.3.13
+Requires:	python%{python3_pkgversion}-qubesadmin >= 4.3.33
 Requires:	python%{python3_pkgversion}-qubesimgconverter
 Requires:	python%{python3_pkgversion}-qasync
 Requires:	python%{python3_pkgversion}-pyxdg