From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 26 Aug 2021 13:00:19 +0000 (+0200)
Subject: qemurunner.py: handle getOutput() having nothing to read
X-Git-Tag: yocto-3.1.11~23
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6f3a8e259ecf6934b32a264661422a6872aca2ef;p=openembedded-core.git

qemurunner.py: handle getOutput() having nothing to read

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f4abfdeea175cfcadd6f73a69a676632ab4334a6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index a9efb849d9..f7e5a3b3a6 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -120,7 +120,10 @@ class QemuRunner:
         import fcntl
         fl = fcntl.fcntl(o, fcntl.F_GETFL)
         fcntl.fcntl(o, fcntl.F_SETFL, fl | os.O_NONBLOCK)
-        return os.read(o.fileno(), 1000000).decode("utf-8")
+        try:
+            return os.read(o.fileno(), 1000000).decode("utf-8")
+        except BlockingIOError:
+            return ""
 
 
     def handleSIGCHLD(self, signum, frame):