diff options
| author |   Mikko Rapeli <mikko.rapeli@linaro.org> | 2023-02-09 10:09:34 +0200 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2023-02-18 06:41:49 -1000 |
| commit | cd6bb88d98b1dc8d751cf75b9ddcca39c84738c6 (patch) | |
| tree | 1347a9972f98470eee163b533f2ee24b5f60e502 | |
| parent | 62df87d3544b7fc3717743b131a62c6092359ec5 (diff) | |
| download | openembedded-core-cd6bb88d98b1dc8d751cf75b9ddcca39c84738c6.tar.gz | |
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.
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>
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 3aeef19434..d21b0a275f 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -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: |