[Xen-changelog] XendDomain.py:

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1528, 2005/05/24 11:12:12+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        XendDomain.py:
          Handle error case where exec fails.
        xpopen.py:
          Exit with 127 if exec fails.
        Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>



 util/xpopen.py     |    2 +-
 xend/XendDomain.py |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)


diff -Nru a/tools/python/xen/util/xpopen.py b/tools/python/xen/util/xpopen.py
--- a/tools/python/xen/util/xpopen.py   2005-05-24 14:02:08 -04:00
+++ b/tools/python/xen/util/xpopen.py   2005-05-24 14:02:08 -04:00
@@ -129,7 +129,7 @@
         try:
             os.execvp(cmd[0], cmd)
         finally:
-            os._exit(1)
+            os._exit(127)
 
     def poll(self):
         """Return the exit status of the child process if it has finished,
diff -Nru a/tools/python/xen/xend/XendDomain.py 
b/tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py       2005-05-24 14:02:08 -04:00
+++ b/tools/python/xen/xend/XendDomain.py       2005-05-24 14:02:08 -04:00
@@ -392,6 +392,8 @@
                 if filter(lambda (fd, event): event & select.POLLHUP, r):
                     break
 
+            if child.wait() >> 8 == 127:
+                lasterr = "popen %s failed" % PATH_XC_RESTORE
             if child.wait() != 0:
                 raise XendError("xc_restore failed: %s" % lasterr)
             

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