2014-10-29 18:03:15 +01:00
|
|
|
Index: virt-manager-1.1.0/virtManager/engine.py
|
|
|
|
|
===================================================================
|
|
|
|
|
--- virt-manager-1.1.0.orig/virtManager/engine.py
|
|
|
|
|
+++ virt-manager-1.1.0/virtManager/engine.py
|
|
|
|
|
@@ -226,9 +226,22 @@ class vmmEngine(vmmGObject):
|
2014-03-14 00:44:08 +01:00
|
|
|
if not uris:
|
|
|
|
|
return
|
|
|
|
|
logging.debug("About to connect to uris %s", uris)
|
|
|
|
|
+ tryuri = vmmConnect.default_uri(always_system=True)
|
|
|
|
|
+ found_uri = None
|
|
|
|
|
for uri in uris:
|
|
|
|
|
+ # If booted Xen, don't try connecting to local qemu
|
|
|
|
|
+ # Likewise if booted native, don't try connecting to local xen
|
|
|
|
|
+ if uri == 'xen:///' or uri == 'qemu:///system':
|
|
|
|
|
+ if tryuri and tryuri != uri:
|
|
|
|
|
+ logging.debug("Skipping %s because it is incompatible with local host", uri)
|
|
|
|
|
+ continue
|
|
|
|
|
+ found_uri = True
|
|
|
|
|
conn = self.make_conn(uri)
|
|
|
|
|
self.register_conn(conn, skip_config=True)
|
|
|
|
|
+ if tryuri and found_uri is None:
|
|
|
|
|
+ logging.debug("Didn't connect with anything, try default %s", tryuri)
|
|
|
|
|
+ conn = self.make_conn(tryuri)
|
|
|
|
|
+ self.register_conn(conn, skip_config=False)
|
|
|
|
|
|
|
|
|
|
def autostart_conns(self):
|
|
|
|
|
"""
|
