virt-manager/virtman-load-stored-uris.patch
Charles Arnold f71f619bc9 - Update to virt-manager 1.2.0
virt-manager-1.2.0.tar.bz2
  virtinst-default-xen-to-qcow2-format.patch
  * OVMF/AAVMF Support (Laszlo Ersek, Giuseppe Scrivano, Cole Robinson)
  * Improved support for AArch64 qemu/kvm
  * virt-install: Support –disk type=network parameters
  * virt-install: Make –disk just work
  * virt-install: Add –disk sgio= option (Giuseppe Scrivano)
  * addhardware: default to an existing bus when adding a new disk (Giuseppe Scrivano)
  * virt-install: Add –input device option
  * virt-manager: Unify storagebrowser and storage details functionality
  * virt-manager: allow setting a custom connection row name
  * virt-install: Support –hostdev scsi passthrough
  * virt-install: Fill in a bunch of –graphics spice options
  * Disable spice image compression for new local VMs
  * virt-manager: big reworking of the migration dialog
- Dropped tarball and patches
  virt-manager-1.1.0.tar.bz2
  0b391fe9-Gtk-30.patch
  20fe2873-check-for-empty-network-name.patch
  24faf867-ignore-error-403-on-directories.patch
  65f7017e-createnet-fix.patch
  activate-default-console.patch
  ce74cd77-connection-state-tick-updates-lock.patch
  virtinst-ppc64le.patch
  virtinst-supported-disk-formats.patch
  virtinst-support-suse-distros.patch
  virt-manager-1.1.0.tar.bz2
  virtman-default-lxc-uri.patch
  virtman-stable-os-support.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=226
2015-05-04 20:15:01 +00:00

32 lines
1.4 KiB
Diff

Reference: bnc#867749
When booted into the native kernel don't ask libvirt to make a
local Xen connection and likewise when booted into the Xen kernel
don't ask libvirt to connect to the local qemu.
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
@@ -227,9 +227,22 @@ class vmmEngine(vmmGObject):
if not uris:
return
logging.debug("About to connect to uris %s", uris)
+ 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):
"""