mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 12:49:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

qemurunner.py: Be more verbose about problems

Browse Source 
Instead of hiding problems in the debug log let's print them as warnings
instead.

(From OE-Core rev: 088f5d97001bd4b573f00cfca93b8d24e814fd64)

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alistair Francis
2019-07-17 13:52:10 -07:00
committed by Richard Purdie
parent 29ee9756b8
commit 4841d57bdb
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
meta/lib/oeqa/utils/qemurunner.py
View File

@@ -98,7 +98,7 @@ class QemuRunner:
def handleSIGCHLD(self, signum, frame): def handleSIGCHLD(self, signum, frame):
if self.runqemu and self.runqemu.poll(): if self.runqemu and self.runqemu.poll():
if self.runqemu.returncode: if self.runqemu.returncode:
self.logger.debug('runqemu exited with code %d' % self.runqemu.returncode) self.logger.warning('runqemu exited with code %d' % self.runqemu.returncode)
self.logger.debug("Output from runqemu:\n%s" % self.getOutput(self.runqemu.stdout)) self.logger.debug("Output from runqemu:\n%s" % self.getOutput(self.runqemu.stdout))
self.stop() self.stop()
self._dump_host() self._dump_host()
@@ -208,9 +208,9 @@ class QemuRunner:
if self.runqemu.poll(): if self.runqemu.poll():
if self.runqemu.returncode: if self.runqemu.returncode:
# No point waiting any longer # No point waiting any longer
self.logger.debug('runqemu exited with code %d' % self.runqemu.returncode) self.logger.warning('runqemu exited with code %d' % self.runqemu.returncode)
self._dump_host() self._dump_host()
self.logger.debug("Output from runqemu:\n%s" % self.getOutput(output)) self.logger.warning("Output from runqemu:\n%s" % self.getOutput(output))
self.stop() self.stop()
return False return False
time.sleep(0.5) time.sleep(0.5)
@@ -329,14 +329,14 @@ class QemuRunner:
if not reachedlogin: if not reachedlogin:
if time.time() >= endtime: if time.time() >= endtime:
self.logger.debug("Target didn't reach login banner in %d seconds (%s)" % self.logger.warning("Target didn't reach login banner in %d seconds (%s)" %
(self.boottime, time.strftime("%D %H:%M:%S"))) (self.boottime, time.strftime("%D %H:%M:%S")))
tail = lambda l: "\n".join(l.splitlines()[-25:]) tail = lambda l: "\n".join(l.splitlines()[-25:])
bootlog = bootlog.decode("utf-8") bootlog = bootlog.decode("utf-8")
# in case bootlog is empty, use tail qemu log store at self.msg # in case bootlog is empty, use tail qemu log store at self.msg
lines = tail(bootlog if bootlog else self.msg) lines = tail(bootlog if bootlog else self.msg)
self.logger.debug("Last 25 lines of text:\n%s" % lines) self.logger.warning("Last 25 lines of text:\n%s" % lines)
self.logger.debug("Check full boot log: %s" % self.logfile) self.logger.warning("Check full boot log: %s" % self.logfile)
self._dump_host() self._dump_host()
self.stop() self.stop()
return False return False
@@ -356,11 +356,11 @@ class QemuRunner:
else: else:
self.logger.debug("Couldn't configure guest networking") self.logger.debug("Couldn't configure guest networking")
else: else:
self.logger.debug("Couldn't login into serial console" self.logger.warning("Couldn't login into serial console"
" as root using blank password") " as root using blank password")
self.logger.debug("The output:\n%s" % output) self.logger.warning("The output:\n%s" % output)
except: except:
self.logger.debug("Serial console failed while trying to login") self.logger.warning("Serial console failed while trying to login")
return True return True
def stop(self): def stop(self):
@@ -414,7 +414,7 @@ class QemuRunner:
self.thread.join() self.thread.join()
def restart(self, qemuparams = None): def restart(self, qemuparams = None):
self.logger.debug("Restarting qemu process") self.logger.warning("Restarting qemu process")
if self.runqemu.poll() is None: if self.runqemu.poll() is None:
self.stop() self.stop()
if self.start(qemuparams): if self.start(qemuparams):