mirror of
https://git.yoctoproject.org/poky
synced 2026-04-09 20:02:21 +02:00
oeqa qemurunner.py: add timeout to QMP calls
When a qemu machine hangs, the QMP calls can hang for ever too, and when this happens any failing test commands from ssh runner may be followed by dump_monitor() calls which then also hang. Hangs followed by hangs. Use runqemutime at setup and run_monitor() specific timeout for later calls. (From OE-Core rev: cd6bb88d98b1dc8d751cf75b9ddcca39c84738c6) Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> (cherry picked from commit 3a07bdf77dc6ecbf4c620b051dd032abaaf1e4ff) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d0ae99feb8
commit
f5c3677f70
@@ -346,6 +346,8 @@ class QemuRunner:
|
||||
return False
|
||||
|
||||
try:
|
||||
# set timeout value for all QMP calls
|
||||
self.qmp.settimeout(self.runqemutime)
|
||||
self.qmp.connect()
|
||||
connect_time = time.time()
|
||||
self.logger.info("QMP connected to QEMU at %s and took %s seconds" %
|
||||
@@ -623,6 +625,7 @@ class QemuRunner:
|
||||
|
||||
def run_monitor(self, command, args=None, timeout=60):
|
||||
if hasattr(self, 'qmp') and self.qmp:
|
||||
self.qmp.settimeout(timeout)
|
||||
if args is not None:
|
||||
return self.qmp.cmd(command, args)
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user