diff options
author | Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com> | 2024-02-29 12:05:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:27:51 +0000 |
commit | b9e9693cb088c7a69dd4ef5ecab906db46d595ba (patch) | |
tree | 557f57b75320b2c5d71db3df459c1ea627c6a303 /meta/lib/oeqa/utils/qemurunner.py | |
parent | 02201e986d4c412f6c2346a41d70e0e680ecb861 (diff) | |
download | poky-b9e9693cb088c7a69dd4ef5ecab906db46d595ba.tar.gz |
qemurunner.py: Fix error on calls to run_monitor
A change in QEMUMonitorProtocol.cmd() requires that we either pass in
kwargs instead of an argument dict or move to cmd_raw()
cmd() was renamed to cmd_raw() (and command() was renamed to cmd())
See:
https://github.com/qemu/qemu/commit/37274707f6f3868fae7e0055d9a703006fc142d0
https://github.com/qemu/qemu/commit/684750ab4f8a3ad69512b71532408be3ac2547d4
My concern with this patch is that I haven't seen this come up with
utils/dump.py which also uses QemuMonitor's run_monitor. If it is
occuring, this should fix issues there as well
(From OE-Core rev: 9665d38ab60c1c3b27887c2b1a6396f13a1b33ea)
Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils/qemurunner.py')
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 277cd32848..cda43aad8c 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -650,9 +650,9 @@ class QemuRunner: | |||
650 | if hasattr(self, 'qmp') and self.qmp: | 650 | if hasattr(self, 'qmp') and self.qmp: |
651 | self.qmp.settimeout(timeout) | 651 | self.qmp.settimeout(timeout) |
652 | if args is not None: | 652 | if args is not None: |
653 | return self.qmp.cmd(command, args) | 653 | return self.qmp.cmd_raw(command, args) |
654 | else: | 654 | else: |
655 | return self.qmp.cmd(command) | 655 | return self.qmp.cmd_raw(command) |
656 | 656 | ||
657 | def run_serial(self, command, raw=False, timeout=60): | 657 | def run_serial(self, command, raw=False, timeout=60): |
658 | # Returns (status, output) where status is 1 on success and 0 on error | 658 | # Returns (status, output) where status is 1 on success and 0 on error |