6bbd8f8c21
virt-manager-1.3.0.tar.bz2 * Git hosting moved to http://github.com/virt-manager/virt-manager * Switch translation infrastructure from transifex to fedora.zanata.org * Add dogtail UI tests and infrastructure * Improved support for s390x kvm (Kevin Zhao) * virt-install and virt-manager now remove created disk images if VM install startup fails * Replace urlgrabber usage with requests and urllib2 * virt-install: add –network virtualport support for openvswitch (Daniel P. Berrange) * virt-install: support multiple –security labels * virt-install: support –features kvm_hidden=on|off (Pavel Hrdina) * virt-install: add –features pmu=on|off * virt-install: add –features pvspinlock=on|off (Abhijeet Kasurde) * virt-install: add –events on_lockfailure=on|off (Abhijeet Kasurde) * virt-install: add –network link_state=up|down * virt-install: add –vcpu placement=static|auto - Dropped virt-manager-1.2.1.tar.bz2 34db1af7-fix-adding-iscsi-pools.patch 360fe110-add-s390x-arch-support.patch 4970615f-fix-qemu-vs-lxc-detection.patch 590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch 601a82cb-fix-console_type-if-xen.patch 76bad650-fix-virt-xml-define-and-update.patch 77423e7a-connection-catch-more-errors-in-filter_nodedevs.patch 8dbe96fc-add-s390x-arch-support.patch a9b303fb-fix-copy-host-cpu-definition.patch aebebbf8-report-an-error-for-pxe-install-without-network.patch cde2f0ef-Suppress-gi-warnings-about-lack-of-require_version.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=283
32 lines
1.4 KiB
Diff
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.3.0/virtManager/engine.py
|
|
===================================================================
|
|
--- virt-manager-1.3.0.orig/virtManager/engine.py
|
|
+++ virt-manager-1.3.0/virtManager/engine.py
|
|
@@ -231,9 +231,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):
|
|
"""
|