[PATCH] Don't explode when running xm as non-root

[PATCH] Don't explode when running xm as non-root

[Dan Smith]

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

The attached patch fixes a recent regression in xm which causes a
stack trace if a user tries to run xm as a non-root user.

I ran the latest xm-test, and nothing (else) broke as a result
of this patch.

Signed-off-by: Dan Smith <danms@us.ibm.com>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: nonroot_fix.patch --]
[-- Type: text/x-patch, Size: 657 bytes --]

diff -r f98c8238e909 tools/python/xen/xend/XendProtocol.py
--- a/tools/python/xen/xend/XendProtocol.py	Wed Oct  5 18:15:56 2005
+++ b/tools/python/xen/xend/XendProtocol.py	Wed Oct  5 15:14:52 2005
@@ -32,9 +32,6 @@
 HTTP_NO_CONTENT                      = 204
 
 
-xroot = XendRoot.instance()
-
-
 class XendError(RuntimeError):
     """Error class for 'expected errors' when talking to xend.
     """
@@ -202,7 +199,7 @@
 
     def __init__(self, path=None):
         if path is None:
-            path = xroot.get_xend_unix_path()
+            path = XendRoot.instance().get_xend_unix_path()
         self.path = path
 
     def makeConnection(self, url):

[-- Attachment #3: Type: text/plain, Size: 87 bytes --]

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms@us.ibm.com

[-- Attachment #4: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel