diff --git a/tools/python/xen/xend/PrettyPrint.py b/tools/python/xen/xend/PrettyPrint.py index 9e91b11448..5fcc6e6d08 100644 --- a/tools/python/xen/xend/PrettyPrint.py +++ b/tools/python/xen/xend/PrettyPrint.py @@ -285,6 +285,16 @@ def prettyprint(sxpr, out=sys.stdout, width=80): sxp.show(sxpr, out=out) print >> out +def prettyprintstring(sxp): + class tmpstr: + def __init__(self): + self.str = "" + def write(self, str): + self.str = self.str + str + tmp = tmpstr() + prettyprint(sxp, out=tmp) + return tmp.str + def main(): pin = sxp.Parser() while 1: diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 1fdfd4ca5a..334a154460 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -28,7 +28,7 @@ from XendLogging import log from XendError import VmError from XendRoot import get_component -from PrettyPrint import prettyprint +from PrettyPrint import prettyprintstring """Flag for a block device backend domain.""" SIF_BLK_BE_DOMAIN = (1<<4) @@ -192,9 +192,8 @@ def vm_recreate(savedinfo, info): @param info: domain info from xc @type info: xc domain dict """ - print 'vm_recreate>' - print 'savedinfo=' ; prettyprint(savedinfo) - print 'info=', info + log.debug('savedinfo=' + prettyprintstring(savedinfo)) + log.debug('info=' + str(info)) vm = XendDomainInfo() vm.recreate = True vm.savedinfo = savedinfo