[Xen-changelog] SrvDaemon.py:

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1662.1.20, 2005/06/09 10:00:58+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        SrvDaemon.py:
          Disable kill of xenstored on xend exit.
        xu.c:
          Set error reason in failure case.
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 lowlevel/xu/xu.c         |    3 ++-
 xend/server/SrvDaemon.py |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)


diff -Nru a/tools/python/xen/lowlevel/xu/xu.c 
b/tools/python/xen/lowlevel/xu/xu.c
--- a/tools/python/xen/lowlevel/xu/xu.c 2005-06-09 13:09:53 -04:00
+++ b/tools/python/xen/lowlevel/xu/xu.c 2005-06-09 13:09:53 -04:00
@@ -1370,7 +1370,8 @@
 
  fail1:
     PyObject_Del((PyObject *)xup);
-    return NULL;    
+    PyErr_SetString(PyExc_ValueError, "cannot create port");
+    return NULL;
 }
 
 static PyObject *xu_port_getattr(PyObject *obj, char *name)
diff -Nru a/tools/python/xen/xend/server/SrvDaemon.py 
b/tools/python/xen/xend/server/SrvDaemon.py
--- a/tools/python/xen/xend/server/SrvDaemon.py 2005-06-09 13:09:54 -04:00
+++ b/tools/python/xen/xend/server/SrvDaemon.py 2005-06-09 13:09:54 -04:00
@@ -130,7 +130,7 @@
 
     def cleanup(self, kill=False):
         self.cleanup_xend(kill=kill)
-        self.cleanup_xenstored(kill=kill)
+        #self.cleanup_xenstored(kill=kill)
 
     def status(self):
         """Returns the status of the xend daemon.

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