summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorYuriy Taraday <yorik.sar@gmail.com>2011-04-28 14:41:56 +0400
committerYuriy Taraday <yorik.sar@gmail.com>2011-04-28 14:41:56 +0400
commit542909e52a6f3f2a9891b710f3755ea7c033a8d0 (patch)
treef122a502d847d2ff489e5fea91229263fc0d5416 /nova
parent523c76b9d1c4bb23530f237f3ebaedc5b86a9cc0 (diff)
Sanitize get_console_output in libvirt_conn
Diffstat (limited to 'nova')
-rw-r--r--nova/virt/libvirt_conn.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 15adcccee..54186ced0 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -695,7 +695,7 @@ class LibvirtConnection(driver.ComputeDriver):
else:
fpath = console_log
- return self._dump_file(fpath)
+ return self._dump_file(fpath).decode('utf8','replace').encode('ascii','replace')
@exception.wrap_exception
def get_ajax_console(self, instance):