From abbc781cab385741b110e6046f36c2fbaf0b6fec Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 6 Apr 2015 16:43:44 -0400
Subject: [PATCH] connect: Expand check for qemu binaries

And drop dead handling of qemu:///session
---
 virtManager/connect.py | 13 ++++++-------
 virtManager/engine.py  |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/virtManager/connect.py b/virtManager/connect.py
index 70f0c2618..8299f5386 100644
--- a/virtManager/connect.py
+++ b/virtManager/connect.py
@@ -18,6 +18,7 @@
 # MA 02110-1301 USA.
 #
 
+import glob
 import os
 import logging
 import socket
@@ -101,7 +102,7 @@ class vmmConnect(vmmGObjectUI):
         self.reset_state()
 
     @staticmethod
-    def default_uri(always_system=False):
+    def default_uri():
         if os.path.exists('/var/lib/xen'):
             if (os.path.exists('/dev/xen/evtchn') or
                 os.path.exists("/proc/xen")):
@@ -110,11 +111,9 @@ class vmmConnect(vmmGObjectUI):
         if (os.path.exists("/usr/bin/qemu") or
             os.path.exists("/usr/bin/qemu-kvm") or
             os.path.exists("/usr/bin/kvm") or
-            os.path.exists("/usr/libexec/qemu-kvm")):
-            if always_system or os.geteuid() == 0:
-                return "qemu:///system"
-            else:
-                return "qemu:///session"
+            os.path.exists("/usr/libexec/qemu-kvm") or
+            glob.glob("/usr/bin/qemu-system-*")):
+            return "qemu:///system"
 
         if (os.path.exists("/usr/lib/libvirt/libvirt_lxc") or
             os.path.exists("/usr/lib64/libvirt/libvirt_lxc")):
@@ -201,7 +200,7 @@ class vmmConnect(vmmGObjectUI):
         return self.widget("connect-remote").get_active()
 
     def set_default_hypervisor(self):
-        default = self.default_uri(always_system=True)
+        default = self.default_uri()
         if not default or default.startswith("qemu"):
             uiutil.set_row_selection(self.widget("hypervisor"), HV_QEMU)
         elif default.startswith("xen"):
diff --git a/virtManager/engine.py b/virtManager/engine.py
index 1f6d46ca1..40f1345b9 100644
--- a/virtManager/engine.py
+++ b/virtManager/engine.py
@@ -200,7 +200,7 @@ class vmmEngine(vmmGObject):
         if ret:
             tryuri = "qemu:///system"
         else:
-            tryuri = vmmConnect.default_uri(always_system=True)
+            tryuri = vmmConnect.default_uri()
 
         if tryuri is None:
             manager.set_startup_error(msg)