Message ID | 0e2725349e86ea3a5324651b67e7fad0da897d22.1709207755.git.pidge@baylibre.com |
---|---|
State | Accepted, archived |
Commit | 9665d38ab60c1c3b27887c2b1a6396f13a1b33ea |
Headers | show |
Series | image-tests and sstate permissions testing | expand |
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 277cd328484..cda43aad8c5 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -650,9 +650,9 @@ class QemuRunner: if hasattr(self, 'qmp') and self.qmp: self.qmp.settimeout(timeout) if args is not None: - return self.qmp.cmd(command, args) + return self.qmp.cmd_raw(command, args) else: - return self.qmp.cmd(command) + return self.qmp.cmd_raw(command) def run_serial(self, command, raw=False, timeout=60): # Returns (status, output) where status is 1 on success and 0 on error
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 Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com> --- meta/lib/oeqa/utils/qemurunner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)