WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] Merge

# HG changeset patch
# User Alastair Tse <atse@xxxxxxxxxxxxx>
# Node ID fb3cb6f52a2905be938559529ae43b6ba990c878
# Parent  9de4597e1269a27719802cbc60c2e943b1ae5930
# Parent  5a21379d087969aee9c573e5cc1571a285fc69ab
Merge
---
 tools/python/xen/lowlevel/xc/xc.c            |    5 ++++-
 tools/python/xen/xend/server/SrvDomainDir.py |    5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff -r 9de4597e1269 -r fb3cb6f52a29 tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c Thu Dec 07 11:50:11 2006 +0000
+++ b/tools/python/xen/lowlevel/xc/xc.c Thu Dec 07 11:51:22 2006 +0000
@@ -46,7 +46,10 @@ static PyObject *pyxc_error_to_exception
     const xc_error const *err = xc_get_last_error();
     const char *desc = xc_error_code_to_desc(err->code);
 
-    if (err->message[1])
+    if (err->code == XC_ERROR_NONE)
+        return PyErr_SetFromErrno(xc_error_obj);
+
+    if (err->message[0] != '\0')
        pyerr = Py_BuildValue("(iss)", err->code, desc, err->message);
     else
        pyerr = Py_BuildValue("(is)", err->code, desc);
diff -r 9de4597e1269 -r fb3cb6f52a29 
tools/python/xen/xend/server/SrvDomainDir.py
--- a/tools/python/xen/xend/server/SrvDomainDir.py      Thu Dec 07 11:50:11 
2006 +0000
+++ b/tools/python/xen/xend/server/SrvDomainDir.py      Thu Dec 07 11:51:22 
2006 +0000
@@ -165,10 +165,9 @@ class SrvDomainDir(SrvDir):
             req.write('<ul>')
             for d in domains:
                 req.write(
-                    '<li><a href="%s%s">Domain %s</a>: id = %s, memory = %d, '
-                    'ssidref = %d.'
+                    '<li><a href="%s%s">Domain %s</a>: id = %s, memory = %d'
                     % (url, d.getName(), d.getName(), d.getDomid(),
-                       d.getMemoryTarget(), d.getSsidref()))
+                       d.getMemoryTarget()))
                 req.write('</li>')
             req.write('</ul>')
 

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

<Prev in Thread] Current Thread [Next in Thread>