summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-01 13:27:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-02 08:10:04 +0100
commit28a0030430d4cfcaf5dfc3e71bda07cdbfbbf4a7 (patch)
treeaa68bca6934317882c089144ce9922abf608bb52
parenteaf83a58825d91c7445835b27d843da7532c208b (diff)
downloadopenembedded-core-contrib-28a0030430d4cfcaf5dfc3e71bda07cdbfbbf4a7.tar.gz
openembedded-core-contrib-28a0030430d4cfcaf5dfc3e71bda07cdbfbbf4a7.tar.bz2
openembedded-core-contrib-28a0030430d4cfcaf5dfc3e71bda07cdbfbbf4a7.zip
qemurunner: Use surrogateescape decoding
Since the stream can contain invalid binary characters (e.g. from ppc's bootloader) use surrogateescape decoding to ensure we do process the character stream, else it can hang/timeout. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index e408fbbf3a..b8ac3f0bb6 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -234,7 +234,7 @@ class QemuRunner:
data = data + sock.recv(1024)
if data:
try:
- data = data.decode("utf-8")
+ data = data.decode("utf-8", errors="surrogateescape")
bootlog += data
data = b''
if re.search(".* login:", bootlog):