direct-io.hg

changeset 12774:fb3cb6f52a29

Merge
author Alastair Tse <atse@xensource.com>
date Thu Dec 07 11:51:22 2006 +0000 (2006-12-07)
parents 9de4597e1269 5a21379d0879
children 60bbcf799384
files
line diff
     1.1 --- a/tools/python/xen/lowlevel/xc/xc.c	Thu Dec 07 11:50:11 2006 +0000
     1.2 +++ b/tools/python/xen/lowlevel/xc/xc.c	Thu Dec 07 11:51:22 2006 +0000
     1.3 @@ -46,7 +46,10 @@ static PyObject *pyxc_error_to_exception
     1.4      const xc_error const *err = xc_get_last_error();
     1.5      const char *desc = xc_error_code_to_desc(err->code);
     1.6  
     1.7 -    if (err->message[1])
     1.8 +    if (err->code == XC_ERROR_NONE)
     1.9 +        return PyErr_SetFromErrno(xc_error_obj);
    1.10 +
    1.11 +    if (err->message[0] != '\0')
    1.12  	pyerr = Py_BuildValue("(iss)", err->code, desc, err->message);
    1.13      else
    1.14  	pyerr = Py_BuildValue("(is)", err->code, desc);
     2.1 --- a/tools/python/xen/xend/server/SrvDomainDir.py	Thu Dec 07 11:50:11 2006 +0000
     2.2 +++ b/tools/python/xen/xend/server/SrvDomainDir.py	Thu Dec 07 11:51:22 2006 +0000
     2.3 @@ -165,10 +165,9 @@ class SrvDomainDir(SrvDir):
     2.4              req.write('<ul>')
     2.5              for d in domains:
     2.6                  req.write(
     2.7 -                    '<li><a href="%s%s">Domain %s</a>: id = %s, memory = %d, '
     2.8 -                    'ssidref = %d.'
     2.9 +                    '<li><a href="%s%s">Domain %s</a>: id = %s, memory = %d'
    2.10                      % (url, d.getName(), d.getName(), d.getDomid(),
    2.11 -                       d.getMemoryTarget(), d.getSsidref()))
    2.12 +                       d.getMemoryTarget()))
    2.13                  req.write('</li>')
    2.14              req.write('</ul>')
    2.15