Accepting request 235124 from home:cbosdonnat:branches:Virtualization

- Improve virt-manager default connections at first start
  * virtman-default-lxc-uri.patch: when only libvirt's lxc driver
    is available locally, add lxc:///
  * virtman-add-connect-default.patch: when no hypervisor can be
    found locally, open the new connection dialog

OBS-URL: https://build.opensuse.org/request/show/235124
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=176

virt-manager.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed May 21 13:43:18 UTC 2014 - cbosdonnat@suse.com
+
+- Improve virt-manager default connections at first start
+  * virtman-default-lxc-uri.patch: when only libvirt's lxc driver
+    is available locally, add lxc:///
+  * virtman-add-connect-default.patch: when no hypervisor can be
+    found locally, open the new connection dialog
+
 -------------------------------------------------------------------
 Thu May 15 17:12:54 MDT 2014 - carnold@suse.com
 

virt-manager.spec

@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define with_guestfs       0
 %define askpass_package    "openssh-askpass"
 %define qemu_user          "qemu"
@@ -80,6 +81,8 @@ Patch67:        virtman-libvirtd-not-running.patch
 Patch68:        virtman-stable-os-support.patch
 Patch69:        virtman-add-s390x-arch-support.patch
 Patch70:        virtman-prevent-double-click-starting-vm-twice.patch
+Patch71:        virtman-default-lxc-uri.patch
+Patch72:        virtman-add-connect-default.patch
 Patch151:       virtinst-storage-ocfs2.patch
 Patch152:       virtinst-qed.patch
 Patch153:       virtinst-support-suse-distros.patch
@@ -224,6 +227,8 @@ machine).
 %patch68 -p1
 %patch69 -p1
 %patch70 -p1
+%patch71 -p1
+%patch72 -p1
 %patch151 -p1
 %patch152 -p1
 %patch153 -p1

virtman-add-connect-default.patch

@@ -0,0 +1,27 @@
+Index: virt-manager-1.0.1/virtManager/engine.py
+===================================================================
+--- virt-manager-1.0.1.orig/virtManager/engine.py
++++ virt-manager-1.0.1/virtManager/engine.py
+@@ -205,9 +205,6 @@ class vmmEngine(vmmGObject):
+         except:
+             logging.exception("Error talking to PackageKit")
+ 
+-        if tryuri is None:
+-            tryuri = "qemu:///system"
+-
+         warnmsg = _("The 'libvirtd' service will need to be started.\n\n"
+                     "After that, virt-manager will connect to libvirt on\n"
+                     "the next application start up.")
+@@ -221,7 +218,11 @@ class vmmEngine(vmmGObject):
+             if not connected and do_start:
+                 manager.err.ok(_("Libvirt service must be started"), warnmsg)
+ 
+-        self.idle_add(idle_connect)
++        # If there is no default URI to be found, show the new connection dialog
++        if tryuri is None:
++            self._do_show_connect(self.windowManager)
++        else:
++            self.idle_add(idle_connect)
+ 
+ 
+     def load_stored_uris(self):

virtman-default-lxc-uri.patch

@@ -0,0 +1,30 @@
+From 02c2d2fcb3c445082a91807ab277a7c85d0a38db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat@free.fr>
+Date: Tue, 20 May 2014 17:14:27 +0200
+Subject: [PATCH] Default connection URI if libvirt-daemon-driver-lxc is
+ installed
+
+The default URI is set to lxc:/// if libvirt's lxc driver is installed
+locally, but only if there is no kvm/xen URI to default to.
+---
+ virtManager/connect.py |  4 ++++
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/virtManager/connect.py b/virtManager/connect.py
+index 1247d75..34835fa 100644
+--- a/virtManager/connect.py
++++ b/virtManager/connect.py
+@@ -116,6 +116,10 @@ class vmmConnect(vmmGObjectUI):
+                 return "qemu:///system"
+             else:
+                 return "qemu:///session"
++
++        if (os.path.exists("/usr/lib/libvirt/libvirt_lxc") or
++            os.path.exists("/usr/lib64/libvirt/libvirt_lxc")):
++            return "lxc:///"
+         return None
+ 
+     def cancel(self, ignore1=None, ignore2=None):
+-- 
+1.8.4.5
+