Skip to content

Commit a533474

Browse files
committed
Close qmemman client with correct handler
For: QubesOS/qubes-issues#1512
1 parent 2488f2b commit a533474

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

qubes/vm/dispvm.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,6 @@ async def on_domain_pre_paused(self, event, **kwargs) -> None:
611611
return
612612
if self.preload_requested:
613613
return
614-
qmemman_client = None
615614
break_task = asyncio.create_task(self.preload_requested_event.wait())
616615
qmemman_task = asyncio.get_event_loop().run_in_executor(
617616
None, self.set_mem
@@ -627,14 +626,14 @@ async def on_domain_pre_paused(self, event, **kwargs) -> None:
627626
else:
628627
break_task.cancel()
629628
except asyncio.CancelledError:
630-
if qmemman_client:
631-
qmemman_client.close()
629+
if qmemman_task:
630+
qmemman_task.close()
632631
except Exception as exc:
633632
self.log.warning(
634633
"Preload memory request before pause failed: %s", str(exc)
635634
)
636-
if qmemman_client:
637-
qmemman_client.close()
635+
if qmemman_task:
636+
qmemman_task.close()
638637
raise
639638
finally:
640639
if self.preload_requested:

0 commit comments

Comments
 (0)