55 lines
2.1 KiB
Diff
55 lines
2.1 KiB
Diff
From daeba426032fa48dec96ecbc5106113152504eb0 Mon Sep 17 00:00:00 2001
|
|
From: Cole Robinson <crobinso@redhat.com>
|
|
Date: Mon, 10 Mar 2014 09:33:04 -0400
|
|
Subject: [PATCH] connection: Handle errors when deregistering events on close
|
|
(bz 1069351)
|
|
|
|
Otherwise this interrupts the close/cleanup routine, and the connection
|
|
never appears to disconnect in the UI. This causes error dialog spamming
|
|
when libvirtd goes down.
|
|
|
|
(cherry picked from commit 081e34715ffa5a210e1e0c8670fe3a1a3ec5180b)
|
|
---
|
|
virtManager/connection.py | 27 ++++++++++++++++++---------
|
|
1 file changed, 18 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/virtManager/connection.py b/virtManager/connection.py
|
|
index 57e143d..4c034b8 100644
|
|
--- a/virtManager/connection.py
|
|
+++ b/virtManager/connection.py
|
|
@@ -929,16 +929,25 @@ class vmmConnection(vmmGObject):
|
|
def close(self):
|
|
def cleanup(devs):
|
|
for dev in devs.values():
|
|
- dev.cleanup()
|
|
-
|
|
- if not self._backend.is_closed():
|
|
- if self._domain_cb_id is not None:
|
|
- self._backend.domainEventDeregisterAny(self._domain_cb_id)
|
|
- self._domain_cb_id = None
|
|
+ try:
|
|
+ dev.cleanup()
|
|
+ except:
|
|
+ logging.debug("Failed to cleanup %s", exc_info=True)
|
|
|
|
- if self._network_cb_id is not None:
|
|
- self._backend.networkEventDeregisterAny(self._network_cb_id)
|
|
- self._network_cb_id = None
|
|
+ try:
|
|
+ if not self._backend.is_closed():
|
|
+ if self._domain_cb_id is not None:
|
|
+ self._backend.domainEventDeregisterAny(
|
|
+ self._domain_cb_id)
|
|
+ self._domain_cb_id = None
|
|
+
|
|
+ if self._network_cb_id is not None:
|
|
+ self._backend.networkEventDeregisterAny(
|
|
+ self._network_cb_id)
|
|
+ self._network_cb_id = None
|
|
+ except:
|
|
+ logging.debug("Failed to deregister events in conn cleanup",
|
|
+ exc_info=True)
|
|
|
|
self._backend.close()
|
|
self.record = []
|