From 75cfe0f95f7e215c4becac0f6a444fe03727ed57 Mon Sep 17 00:00:00 2001
From: Guido Gunther <agx@sigxcpu.org>
Date: Mon, 22 Sep 2008 17:50:49 +0200
Subject: [PATCH] fix network handling in qemu session mode

---
 src/virtManager/addhardware.py | 17 +++++++++--------
 src/virtManager/connection.py  |  6 ++++++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py
index fb29b672..c2b6147d 100644
--- a/src/virtManager/addhardware.py
+++ b/src/virtManager/addhardware.py
@@ -217,11 +217,10 @@ class vmmAddHardware(gobject.GObject):
         model = self.window.get_widget("hardware-type").get_model()
         model.clear()
         model.append(["Storage device", gtk.STOCK_HARDDISK, PAGE_DISK])
-        # Can't use shared or virtual networking as regular user
+        # Can't use shared or virtual networking in qemu:///session
         # Can only have one usermode network device
-        if (os.getuid() == 0 or
-            (self.vm.get_connection().get_type().lower() == "qemu" and
-             len(self.vm.get_network_devices()) == 0)):
+        if not self.vm.get_connection().is_qemu_session() or \
+           len(self.vm.get_network_devices()) == 0:
             model.append(["Network card", gtk.STOCK_NETWORK, PAGE_NETWORK])
 
         # Can only customize HVM guests, no Xen PV
@@ -242,7 +241,8 @@ class vmmAddHardware(gobject.GObject):
 
         hwtype = self.get_config_hardware_type()
         if notebook.get_current_page() == PAGE_INTRO and \
-           (hwtype != PAGE_NETWORK or os.getuid() == 0):
+           (hwtype != PAGE_NETWORK or \
+            not self.vm.get_connection().is_qemu_session()):
             notebook.set_current_page(hwtype)
         else:
             notebook.set_current_page(PAGE_SUMMARY)
@@ -255,7 +255,8 @@ class vmmAddHardware(gobject.GObject):
 
         if notebook.get_current_page() == PAGE_SUMMARY:
             hwtype = self.get_config_hardware_type()
-            if hwtype == PAGE_NETWORK and os.getuid() != 0:
+            if hwtype == PAGE_NETWORK and \
+               self.vm.get_connection().is_qemu_session():
                 notebook.set_current_page(PAGE_INTRO)
             else:
                 notebook.set_current_page(hwtype)
@@ -344,7 +345,7 @@ class vmmAddHardware(gobject.GObject):
             return None
 
     def get_config_network(self):
-        if os.getuid() != 0:
+        if self.vm.get_connection().is_qemu_session():
             return ["user"]
 
         if self.window.get_widget("net-type-network").get_active():
@@ -496,7 +497,7 @@ class vmmAddHardware(gobject.GObject):
         self.close()
 
     def add_network(self):
-        if self._dev is None and os.getuid() != 0:
+        if self._dev is None and self.vm.get_connection().is_qemu_session():
             self._dev = virtinst.VirtualNetworkInterface(type="user")
         self._dev.setup(self.vm.get_connection().vmm)
         self.add_device(self._dev.get_xml_config())
diff --git a/src/virtManager/connection.py b/src/virtManager/connection.py
index 4e5e0345..6e240e71 100644
--- a/src/virtManager/connection.py
+++ b/src/virtManager/connection.py
@@ -347,6 +347,12 @@ class vmmConnection(gobject.GObject):
         except:
             return True
 
+    def is_qemu_session(self):
+        (scheme, username, netloc, path, query, fragment) = uri_split(self.uri)
+        if path == "/session" and scheme.startswith("qemu"):
+            return True
+        return False
+
     def get_uri(self):
         return self.uri