a18ef09a88
virtinst-add-default-rng-device.patch - Fix GUI failure to display addition of a second disk Dropped virtman-device-flags.patch - bnc#885380 - virt-install: by default generates raw format against various virtual disk formats virtinst-supported-disk-formats.patch virtman-supported-disk-formats.patch - Dropped virtinst-qed.patch, virtman-qed.patch - bnc#869026 - Build0198: Unable to complete install: 'XML error: No PCI buses available' virtman-add-s390x-arch-support.patch - Upstream bug fixes 53ac1f8d-createnet-validate-last-page-before-creating-network.patch 53ac1f8d-fix-show_err-typo.patch 53b39a13-dont-create-disk-images-world-readable-executable.patch 53b409bc-add-keep-alive-method-and-connection-check.patch 53b409bd-console-prevent-access-to-deleted-objects.patch 53b728c6-report-error-during-connection-bring-up.patch 53b728c6-connection-handle-unsupported-KeepAlive.patch 53bb1995-network-refresh-XML-definition-on-state-update.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=188
56 lines
2.7 KiB
Diff
56 lines
2.7 KiB
Diff
Subject: connection: Report error if things fall over during connection bring up
|
|
From: Cole Robinson crobinso@redhat.com Fri Jul 4 17:37:42 2014 -0400
|
|
Date: Fri Jul 4 18:20:54 2014 -0400:
|
|
Git: e12d7a6a8c21f0d8e0331fa06f53523258bdfaae
|
|
|
|
|
|
Index: virt-manager-1.0.1/virtManager/connection.py
|
|
===================================================================
|
|
--- virt-manager-1.0.1.orig/virtManager/connection.py
|
|
+++ virt-manager-1.0.1/virtManager/connection.py
|
|
@@ -1101,23 +1101,27 @@ class vmmConnection(vmmGObject):
|
|
def _open_notify(self):
|
|
logging.debug("Notifying open result")
|
|
|
|
- self.idle_emit("state-changed")
|
|
-
|
|
- if self.state == self.STATE_ACTIVE:
|
|
- logging.debug("libvirt version=%s",
|
|
- self._backend.local_libvirt_version())
|
|
- logging.debug("daemon version=%s",
|
|
- self._backend.daemon_version())
|
|
- logging.debug("conn version=%s", self._backend.conn_version())
|
|
- logging.debug("%s capabilities:\n%s",
|
|
- self.get_uri(), self.caps.xml)
|
|
- self._add_conn_events()
|
|
- self._backend.setKeepAlive(20, 1)
|
|
- self.schedule_priority_tick(stats_update=True,
|
|
- pollvm=True, pollnet=True,
|
|
- pollpool=True, polliface=True,
|
|
- pollnodedev=True, pollmedia=True,
|
|
- force=True)
|
|
+ try:
|
|
+ self.idle_emit("state-changed")
|
|
+ if self.state == self.STATE_ACTIVE:
|
|
+ logging.debug("libvirt version=%s",
|
|
+ self._backend.local_libvirt_version())
|
|
+ logging.debug("daemon version=%s",
|
|
+ self._backend.daemon_version())
|
|
+ logging.debug("conn version=%s", self._backend.conn_version())
|
|
+ logging.debug("%s capabilities:\n%s",
|
|
+ self.get_uri(), self.caps.xml)
|
|
+ self._add_conn_events()
|
|
+ self._backend.setKeepAlive(20, 1)
|
|
+ self.schedule_priority_tick(stats_update=True,
|
|
+ pollvm=True, pollnet=True,
|
|
+ pollpool=True, polliface=True,
|
|
+ pollnodedev=True, pollmedia=True,
|
|
+ force=True)
|
|
+ except Exception, e:
|
|
+ self.close()
|
|
+ self.connectError = (str(e),
|
|
+ "".join(traceback.format_exc()), False)
|
|
|
|
if self.state == self.STATE_DISCONNECTED:
|
|
if self.connectError:
|