Kill paused qubes on system shutdown

fixes: QubesOS/qubes-issues#8580

qubes/tests/__init__.py

@@ -1233,6 +1233,19 @@ def shutdown_and_wait(self, vm, timeout=60):
  del vm
  self.fail("Timeout while waiting for VM {} shutdown".format(name))
 
+ def shutdown_paused(self, vm, timeout=60):
+ try:
+ self.loop.run_until_complete(vm.pause())
+ with self.assertRaises(qubes.exc.QubesVMNotRunningError):
+ self.loop.run_until_complete(
+ vm.shutdown(wait=True, timeout=timeout, force=False))
+ self.loop.run_until_complete(
+ vm.shutdown(wait=True, timeout=timeout, force=True))
+ except qubes.exc.QubesException:
+ name = vm.name
+ del vm
+ self.fail("Timeout while waiting for VM {} shutdown".format(name))
+
  def prepare_hvm_system_linux(self, vm, init_script, extra_files=None):
  if not os.path.exists('/usr/lib/grub/i386-pc'):
  self.skipTest('grub2 not installed')

qubes/vm/qubesvm.py

@@ -1382,10 +1382,17 @@ async def shutdown(self, force=False, wait=False, timeout=None):
  await self.fire_event_async('domain-pre-shutdown',
  pre_event=True, force=force)
 
+ if self.is_paused() and not force:
+ raise qubes.exc.QubesVMNotRunningError(self)
+
  if self.__waiter is None:
  self.__waiter = asyncio.get_running_loop().create_future()
  waiter = self.__waiter
- self.libvirt_domain.shutdown()
+
+ if self.is_paused():
+ self.libvirt_domain.destroy()
+ else:
+ self.libvirt_domain.shutdown()
 
  if wait:
  if timeout is None: