Merge

tools/python/xen/lowlevel/xc/xc.c

@@ -46,7 +46,10 @@ static PyObject *pyxc_error_to_exception(void)
     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);

tools/python/xen/xend/server/SrvDomainDir.py

@@ -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>')