virt-manager/virtman-load-stored-uris.patch
Charles Arnold c085d819a8 - Update to virt-manager 1.5.0 (bsc#1027942)
virt-manager-1.5.0.tar.bz2
  * python3 prep work (Radostin Stoyanov, Cole Robinson, Cédric Bosdonnat)
  * Switch –location ISO to use isoinfo (Andrew Wong)
  * virt-install: add –cpu numa distance handling (Menno Lageman)
  * virt-install: fix –disk for rbd volumes with auth (Rauno Väli)
  * virt-install: add –cputune vcpupin handling (Wim ten Have)
  * details ui: Showing attached scsi devices per controller (Lin Ma)
  * network ui: Show details about SR-IOV VF pool (Lin Ma)
  * Greatly expand UI test suite coverage
- Dropped patches
  0001-Improve-container-image-url-example.patch
  0001-py3-store-exception-variables-for-use-outside-except.patch
  0002-create-wizard-fix-alignment-in-os-container-page.patch
  0003-oscontainer-ask-root-password-in-the-wizard.patch
  0004-Harmonize-invisible_char-values.patch
  083dfcc8-Show-details-about-the-network-of-SR-IOV-VF-pool.patch
  08a58d61-pycodestyle-remove-description-of-fixed-errors.patch
  0c6bcb09-fix-bytes-string-mess-in-serial-console.patch
  0e812e3c-dont-skip-authentication-for-listen-type-none-with-fixed-QEMU.patch
  23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch
  2d276ebe-progress-dont-overwrite-format.patch
  2eb455c9-correctly-calculate-virtio-scsi-controller-index.patch
  374a3779-urlfetcher-write-test-file-as-binary-content.patch
  37ea5207-replace-StandardError-with-Exception.patch
  3b769643-dont-add-URI-into-params-for-tunneled-migration.patch
  3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch
  44de92b7-use-reload-from-imp-module.patch
  63fce081-pycodestyle-Use-isinstance-for-type-checking.patch
  67122615-python2to3-division-compatability.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=406
2018-02-07 16:59:50 +00:00

28 lines
1.2 KiB
Diff

Index: virt-manager-1.5.0/virtManager/engine.py
===================================================================
--- virt-manager-1.5.0.orig/virtManager/engine.py
+++ virt-manager-1.5.0/virtManager/engine.py
@@ -260,9 +260,22 @@ class vmmEngine(vmmGObject):
def load_stored_uris(self):
uris = self.config.get_conn_uris() or []
+ tryuri = vmmConnect.default_uri()
+ 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):
"""